ALSA: x86: hdmi: fix returnvar.cocci warnings
PATCH 1/1 ALSA: x86: hdmi: fix returnvar.cocci warnings
Remove unneeded variable used to store return value.
Generated by: scripts/coccinelle/misc/returnvar.cocci
---
In-Reply-To: <[email protected]> url:
https://github.com/0day-ci/linux/commits/Jerome-Anand/Add-support-for-Legacy
-HDMI-audio-drivers/20170124-213547
This is probably not the right patch. It si just what the rule generates. Instead, I guess that retval should be updated in some way?
intel_hdmi_audio_if.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
sound/x86/intel_hdmi_audio_if.c +9 -12
@@ -239,7 +239,6 @@ static inline int had_chk_intrmiss(strucint had_process_buffer_done (struct snd_intelhad *intelhaddata) { -int retval =0 ;u32 len =1 ;enum intel_had_aud_buf_type buf_id;enum intel_had_aud_buf_type buff_done;
@@ -258,7 +257,7 @@ int had_process_buffer_done(struct snd_iif (intelhaddata->drv_status ==HAD_DRV_DISCONNECTED ) {spin_unlock_irqrestore (&intelhaddata->had_spinlock, flag_irqs);pr_err ("%s:Device already disconnected\n" , __func__); -return retval; +return 0 ; } buf_id = intelhaddata->curr_buf; intelhaddata->buff_done = buf_id;
@@ -280,7 +279,7 @@ int had_process_buffer_done(struct snd_iif (!intr_count || (intr_count >3 )) {pr_err ("HAD SW state in non-recoverable!!! mode\n" );pr_err ("Already played stale data\n" ); -return retval; +return 0 ; } buf_id += (intr_count -1 ); buf_id = buf_id %4 ;
@@ -298,7 +297,7 @@ int had_process_buffer_done(struct snd_iif (had_get_hwstate (intelhaddata)) {pr_err ("HDMI cable plugged-out\n" ); -return retval; +return 0 ; }/*Reprogram the registers with addr and length*/
@@ -322,12 +321,11 @@ int had_process_buffer_done(struct snd_i stream->period_elapsed (stream->had_substream); } -return retval; +return 0 ; }int had_process_buffer_underrun (struct snd_intelhad *intelhaddata) { -int retval =0 ;enum intel_had_aud_buf_type buf_id;struct pcm_stream_info *stream;struct had_pvt_data *had_stream;
@@ -355,7 +353,7 @@ int had_process_buffer_underrun(struct sif (drv_status ==HAD_DRV_DISCONNECTED ) {pr_err ("%s:Device already disconnected\n" , __func__); -return retval; +return 0 ; }if (stream_type ==HAD_RUNNING_STREAM ) {
@@ -364,12 +362,11 @@ int had_process_buffer_underrun(struct s stream->period_elapsed (stream->had_substream); } -return retval; +return 0 ; }int had_process_hot_plug (struct snd_intelhad *intelhaddata) { -int retval =0 ;enum intel_had_aud_buf_type buf_id;struct snd_pcm_substream *substream;struct had_pvt_data *had_stream;
@@ -384,7 +381,7 @@ int had_process_hot_plug(struct snd_inteif (intelhaddata->drv_status ==HAD_DRV_CONNECTED ) {pr_debug ("Device already connected\n" );spin_unlock_irqrestore (&intelhaddata->had_spinlock, flag_irqs); -return retval; +return 0 ; } buf_id = intelhaddata->curr_buf; intelhaddata->buff_done = buf_id;
@@ -422,12 +419,12 @@ int had_process_hot_plug(struct snd_intehad_build_channel_allocation_map (intelhaddata); -return retval; +return 0 ; err:pm_runtime_disable (intelhaddata->dev); intelhaddata->dev =NULL ; -return retval; +return 0 ; }int had_process_hot_unplug (struct snd_intelhad *intelhaddata)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Julia Lawall
Remove unneeded variable used to store return value.
Generated by:
scripts/coccinelle/misc/returnvar.cocciCC Jerome Anand <[email protected]>Signed-off-by Julia Lawall <[email protected]>Signed-off-by Fengguang Wu <[email protected]>---
Quoted 7 lines
In-Reply-To: <[email protected]> url:
https://github.com/0day-ci/linux/commits/Jerome-Anand/Add-support-for-Legacy
-HDMI-audio-drivers/20170124-213547This is probably not the right patch. It si just what the rule generates. Instead, I guess that retval should be updated in some way?
Yeah, it looks a bit suspicious, but it can be fixed later. So I applied your cleanup now.
thanks,
Takashi
Quoted 93 lines
intel_hdmi_audio_if.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)sound/x86/intel_hdmi_audio_if.c +7
-11@@ -239,7 +239,6 @@ static inline int had_chk_intrmiss(strucint had_process_buffer_done (struct snd_intelhad *intelhaddata) { -int retval =0 ;u32 len =1 ;enum intel_had_aud_buf_type buf_id;enum intel_had_aud_buf_type buff_done;@@ -258,7 +257,7 @@ int had_process_buffer_done(struct snd_iif (intelhaddata->drv_status ==HAD_DRV_DISCONNECTED ) {spin_unlock_irqrestore (&intelhaddata->had_spinlock, flag_irqs);pr_err ("%s:Device already disconnected\n" , __func__); -return retval; +return 0 ; } buf_id = intelhaddata->curr_buf; intelhaddata->buff_done = buf_id;@@ -280,7 +279,7 @@ int had_process_buffer_done(struct snd_iif (!intr_count || (intr_count >3 )) {pr_err ("HAD SW state in non-recoverable!!! mode\n" );pr_err ("Already played stale data\n" ); -return retval; +return 0 ; } buf_id += (intr_count -1 ); buf_id = buf_id %4 ;@@ -298,7 +297,7 @@ int had_process_buffer_done(struct snd_iif (had_get_hwstate (intelhaddata)) {pr_err ("HDMI cable plugged-out\n" ); -return retval; +return 0 ; }/*Reprogram the registers with addr and length*/ @@ -322,12 +321,11 @@ int had_process_buffer_done(struct snd_i stream->period_elapsed (stream->had_substream); } -return retval; +return 0 ; }int had_process_buffer_underrun (struct snd_intelhad *intelhaddata) { -int retval =0 ;enum intel_had_aud_buf_type buf_id;struct pcm_stream_info *stream;struct had_pvt_data *had_stream;@@ -355,7 +353,7 @@ int had_process_buffer_underrun(struct sif (drv_status ==HAD_DRV_DISCONNECTED ) {pr_err ("%s:Device already disconnected\n" , __func__); -return retval; +return 0 ; }if (stream_type ==HAD_RUNNING_STREAM ) {@@ -364,12 +362,11 @@ int had_process_buffer_underrun(struct s stream->period_elapsed (stream->had_substream); } -return retval; +return 0 ; }int had_process_hot_plug (struct snd_intelhad *intelhaddata) { -int retval =0 ;enum intel_had_aud_buf_type buf_id;struct snd_pcm_substream *substream;struct had_pvt_data *had_stream;@@ -384,7 +381,7 @@ int had_process_hot_plug(struct snd_inteif (intelhaddata->drv_status ==HAD_DRV_CONNECTED ) {pr_debug ("Device already connected\n" );spin_unlock_irqrestore (&intelhaddata->had_spinlock, flag_irqs); -return retval; +return 0 ; } buf_id = intelhaddata->curr_buf; intelhaddata->buff_done = buf_id;@@ -422,12 +419,12 @@ int had_process_hot_plug(struct snd_intehad_build_channel_allocation_map (intelhaddata); -return retval;
sound/x86/intel_hdmi_audio_if.c int had_process_hot_plug(struct snd_inte · line 430
Quoted 10 lines
sound/x86/intel_hdmi_audio_if.c +2
-1+return 0 ; err:pm_runtime_disable (intelhaddata->dev); intelhaddata->dev =NULL ; -return retval; +return 0 ; }int had_process_hot_unplug (struct snd_intelhad *intelhaddata)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx