| Message ID | 1599636807-9003-1-git-send-email-tiantao6@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: Remove unused variables | expand |
Hi Am 09.09.20 um 09:33 schrieb Tian Tao: > Fixes the following W=1 kernel build warning(s): > vc4_plane.c: In function ‘vc4_plane_init’: > vc4_plane.c:1340:6: warning: variable ‘ret’ set but not > used [-Wunused-but-set-variable] > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> > --- > drivers/gpu/drm/vc4/vc4_plane.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c > index 24d7e6d..5be0f5dda 100644 > --- a/drivers/gpu/drm/vc4/vc4_plane.c > +++ b/drivers/gpu/drm/vc4/vc4_plane.c > @@ -1337,7 +1337,6 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, > struct drm_plane *plane = NULL; > struct vc4_plane *vc4_plane; > u32 formats[ARRAY_SIZE(hvs_formats)]; > - int ret = 0; > unsigned i; > static const uint64_t modifiers[] = { > DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, > @@ -1357,7 +1356,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, > formats[i] = hvs_formats[i].drm; > > plane = &vc4_plane->base; > - ret = drm_universal_plane_init(dev, plane, 0, > + drm_universal_plane_init(dev, plane, 0, > &vc4_plane_funcs, > formats, ARRAY_SIZE(formats), > modifiers, type, NULL); IMHO vc4_plane_init() should rather handle ret correctly and return an error if it's non-zero. Best regards Thomas >
Hi Thomas: 在 2020/9/11 15:47, Thomas Zimmermann 写道: > Hi > > Am 09.09.20 um 09:33 schrieb Tian Tao: >> Fixes the following W=1 kernel build warning(s): >> vc4_plane.c: In function ‘vc4_plane_init’: >> vc4_plane.c:1340:6: warning: variable ‘ret’ set but not >> used [-Wunused-but-set-variable] >> >> Signed-off-by: Tian Tao <tiantao6@hisilicon.com> >> --- >> drivers/gpu/drm/vc4/vc4_plane.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c >> index 24d7e6d..5be0f5dda 100644 >> --- a/drivers/gpu/drm/vc4/vc4_plane.c >> +++ b/drivers/gpu/drm/vc4/vc4_plane.c >> @@ -1337,7 +1337,6 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, >> struct drm_plane *plane = NULL; >> struct vc4_plane *vc4_plane; >> u32 formats[ARRAY_SIZE(hvs_formats)]; >> - int ret = 0; >> unsigned i; >> static const uint64_t modifiers[] = { >> DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, >> @@ -1357,7 +1356,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, >> formats[i] = hvs_formats[i].drm; >> >> plane = &vc4_plane->base; >> - ret = drm_universal_plane_init(dev, plane, 0, >> + drm_universal_plane_init(dev, plane, 0, >> &vc4_plane_funcs, >> formats, ARRAY_SIZE(formats), >> modifiers, type, NULL); > > IMHO vc4_plane_init() should rather handle ret correctly and return an > error if it's non-zero. Thanks for the advice, I'm dropping the patch and re-posting anoher patch to fix this warning. > > Best regards > Thomas > >> >
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 24d7e6d..5be0f5dda 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1337,7 +1337,6 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, struct drm_plane *plane = NULL; struct vc4_plane *vc4_plane; u32 formats[ARRAY_SIZE(hvs_formats)]; - int ret = 0; unsigned i; static const uint64_t modifiers[] = { DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED, @@ -1357,7 +1356,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, formats[i] = hvs_formats[i].drm; plane = &vc4_plane->base; - ret = drm_universal_plane_init(dev, plane, 0, + drm_universal_plane_init(dev, plane, 0, &vc4_plane_funcs, formats, ARRAY_SIZE(formats), modifiers, type, NULL);
Fixes the following W=1 kernel build warning(s): vc4_plane.c: In function ‘vc4_plane_init’: vc4_plane.c:1340:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] Signed-off-by: Tian Tao <tiantao6@hisilicon.com> --- drivers/gpu/drm/vc4/vc4_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)