cgel.zte at gmail.com
2022-Apr-29 09:03 UTC
[Nouveau] [PATCH] drm/nouveau: simplify the return expression of nouveau_debugfs_init()
From: Minghao Chi <chi.minghao at zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci at zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao at zte.com.cn> --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 1cbe01048b93..76b621f99916 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -255,19 +255,13 @@ nouveau_drm_debugfs_init(struct drm_minor *minor) int nouveau_debugfs_init(struct nouveau_drm *drm) { - int ret; - drm->debugfs = kzalloc(sizeof(*drm->debugfs), GFP_KERNEL); if (!drm->debugfs) return -ENOMEM; - ret = nvif_object_ctor(&drm->client.device.object, "debugfsCtrl", 0, + return nvif_object_ctor(&drm->client.device.object, "debugfsCtrl", 0, NVIF_CLASS_CONTROL, NULL, 0, &drm->debugfs->ctrl); - if (ret) - return ret; - - return 0; } void -- 2.25.1
Lyude Paul
2022-Apr-29 19:38 UTC
[Nouveau] [PATCH] drm/nouveau: simplify the return expression of nouveau_debugfs_init()
Reviewed-by: Lyude Paul <lyude at redhat.com> Will push to drm-misc-next in a bit (Kind of impressed that a bot managed to catch this, considering the route from here to the code capable of returning < 0 or 0 was definitely not obvious) On Fri, 2022-04-29 at 09:03 +0000, cgel.zte at gmail.com wrote:> From: Minghao Chi <chi.minghao at zte.com.cn> > > Simplify the return expression. > > Reported-by: Zeal Robot <zealci at zte.com.cn> > Signed-off-by: Minghao Chi <chi.minghao at zte.com.cn> > --- > ?drivers/gpu/drm/nouveau/nouveau_debugfs.c | 8 +------- > ?1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c > b/drivers/gpu/drm/nouveau/nouveau_debugfs.c > index 1cbe01048b93..76b621f99916 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c > +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c > @@ -255,19 +255,13 @@ nouveau_drm_debugfs_init(struct drm_minor *minor) > ?int > ?nouveau_debugfs_init(struct nouveau_drm *drm) > ?{ > -???????int ret; > - > ????????drm->debugfs = kzalloc(sizeof(*drm->debugfs), GFP_KERNEL); > ????????if (!drm->debugfs) > ????????????????return -ENOMEM; > ? > -???????ret = nvif_object_ctor(&drm->client.device.object, "debugfsCtrl", 0, > +???????return nvif_object_ctor(&drm->client.device.object, "debugfsCtrl", > 0, > ?????????????????????????????? NVIF_CLASS_CONTROL, NULL, 0, > ?????????????????????????????? &drm->debugfs->ctrl); > -???????if (ret) > -???????????????return ret; > - > -???????return 0; > ?} > ? > ?void-- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat