Re: [PATCH 38/42] drm/vc4/vc4_hdmi: Remove set but unused variable 'ret'

[Daniel Vetter]

On Mon, Nov 16, 2020 at 05:41:08PM +0000, Lee Jones wrote:
> Fixes the following W=1 kernel build warning(s):
> 
>  drivers/gpu/drm/vc4/vc4_hdmi.c: In function ‘vc4_hdmi_set_audio_infoframe’:
>  drivers/gpu/drm/vc4/vc4_hdmi.c:334:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
> 
> Cc: Eric Anholt <eric@xxxxxxxxxx>
> Cc: Maxime Ripard <mripard@xxxxxxxxxx>
> Cc: David Airlie <airlied@xxxxxxxx>
> Cc: Daniel Vetter <daniel@xxxxxxxx>
> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Cc: Rob Clark <robdclark@xxxxxxxxx>
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>

Hm this is another where I think the right thing to do is switch the
return value from int to void. All users are maintained in drm except
sound/soc, so probably good enough as a single patch. If you feel like,
otherwise I can type it up too.

Anyway applied this one here.
-Daniel

> ---
>  drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 95779d50cca0b..b80eb9d3d9d5a 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -331,9 +331,8 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder)
>  {
>  	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
>  	union hdmi_infoframe frame;
> -	int ret;
>  
> -	ret = hdmi_audio_infoframe_init(&frame.audio);
> +	hdmi_audio_infoframe_init(&frame.audio);
>  
>  	frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
>  	frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
> -- 
> 2.25.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch