| Message ID | d1d2c154-0097-9630-f9ed-9ee55de03a24@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 22.07.2016 17:48, schrieb SF Markus Elfring: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Fri, 22 Jul 2016 16:45:22 +0200 > > Move a return statement into a block for successful function execution. > Omit a duplicate check for the local variable "ret" then at the end. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > index 8eee742..851a8ba 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c > @@ -661,13 +661,9 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, > */ > mapping = obj->filp->f_mapping; > mapping_set_gfp_mask(mapping, GFP_HIGHUSER); > + return obj; > } > > - if (ret) > - goto fail; > - > - return obj; > - > fail: > drm_gem_object_unreference_unlocked(obj); > return ERR_PTR(ret); From the program flow an readability it would be more nice the branch on error ret = drm_gem_object_init(dev, obj, size); if (ret) goto fail; just m 2 cents re, wh
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 8eee742..851a8ba 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -661,13 +661,9 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, */ mapping = obj->filp->f_mapping; mapping_set_gfp_mask(mapping, GFP_HIGHUSER); + return obj; } - if (ret) - goto fail; - - return obj; - fail: drm_gem_object_unreference_unlocked(obj); return ERR_PTR(ret);