Re: [PATCH v2] drm/hisilicon: Use drmm_kzalloc() instead of devm_kzalloc()

From: Thomas Zimmermann
Date: Thu Jul 02 2020 - 03:20:37 EST


Hi

Am 02.07.20 um 09:06 schrieb Tian Tao:
> using the new API drmm_kzalloc() instead of devm_kzalloc()
>
> v2:
> keep the DRM include statements sorted alphabetically.
>
> Signed-off-by: Tian Tao <tiantao6@xxxxxxxxxxxxx>
> Reviewed-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> ---
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index a6fd0c2..b557728 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -11,18 +11,18 @@
> * Jianhua Li <lijianhua@xxxxxxxxxx>
> */
>
> +#include <drm/drm_gem_vram_helper.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_probe_helper.h>
> +#include <drm/drm_fb_helper.h>
> +#include <drm/drm_managed.h>
> +#include <drm/drm_vblank.h>
> +#include <drm/drm_print.h>
> #include <linux/console.h>
> #include <linux/module.h>
> -#include <linux/pci.h>
> -
> -#include <drm/drm_atomic_helper.h>
> #include <drm/drm_drv.h>
> -#include <drm/drm_fb_helper.h>
> -#include <drm/drm_gem_vram_helper.h>
> #include <drm/drm_irq.h>
> -#include <drm/drm_print.h>
> -#include <drm/drm_probe_helper.h>
> -#include <drm/drm_vblank.h>
> +#include <linux/pci.h>

Ok, that's a bit too much. :D

First of all, it's still not alphabetically. Second, linux headers go
first, then drm headers follow. It should look like

#include <linux/...>
#include <linux/...>
#include <linux/...>

#include <drm/...>
#include <drm/...>
#include <drm/...>

with each block sorted alphabetically.

If you include drm_managed.h right before drm_print.h, it should be fine
already.

Best regards
Thomas

>
> #include "hibmc_drm_drv.h"
> #include "hibmc_drm_regs.h"
> @@ -267,7 +267,7 @@ static int hibmc_load(struct drm_device *dev)
> struct hibmc_drm_private *priv;
> int ret;
>
> - priv = devm_kzalloc(dev->dev, sizeof(*priv), GFP_KERNEL);
> + priv = drmm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> if (!priv) {
> DRM_ERROR("no memory to allocate for hibmc_drm_private\n");
> return -ENOMEM;
>

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 NÃrnberg, Germany
(HRB 36809, AG NÃrnberg)
GeschÃftsfÃhrer: Felix ImendÃrffer

Attachment: signature.asc
Description: OpenPGP digital signature