Re: [cocci] [PATCH 14/36] ASoC: remove conditional return with no effect

On 7/24/26 00:15, Sang-Heon Jeon wrote:
> [You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> Both branches of the check return the same value, so the check has
> no effect. Remove it and return the value directly.
>
> This is the result of running the Coccinelle script from
> scripts/coccinelle/misc/cond_return_no_effect.cocci.
Could you please separate the changes in to vendor specific patches?
> Signed-off-by: Sang-Heon Jeon <[email protected]>
> ---
>   sound/soc/amd/acp/acp-mach-common.c          | 11 +++--------
>   sound/soc/intel/atom/sst-mfld-platform-pcm.c |  7 +------
>   sound/soc/samsung/smdk_spdif.c               |  8 ++------
>   sound/soc/sof/intel/hda-dsp.c                |  6 +-----
>   4 files changed, 7 insertions(+), 25 deletions(-)
>
> diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
> index ef784cca13f2..01a0aaa60246 100644
> --- a/sound/soc/amd/acp/acp-mach-common.c
> +++ b/sound/soc/amd/acp/acp-mach-common.c
> @@ -938,15 +938,10 @@ static int acp_max98388_hw_params(struct snd_pcm_substream *substream,
>          struct snd_soc_dai *codec_dai =
>                          snd_soc_card_get_codec_dai(card,
>                                                     MAX98388_CODEC_DAI);
> -       int ret;
>
> -       ret = snd_soc_dai_set_fmt(codec_dai,
> -                                 SND_SOC_DAIFMT_CBC_CFC | SND_SOC_DAIFMT_I2S |
> -                                 SND_SOC_DAIFMT_NB_NF);
> -       if (ret < 0)
> -               return ret;
> -
> -       return ret;
> +       return snd_soc_dai_set_fmt(codec_dai,
> +                                  SND_SOC_DAIFMT_CBC_CFC | SND_SOC_DAIFMT_I2S |
> +                                  SND_SOC_DAIFMT_NB_NF);
>   }
>
>   static const struct snd_soc_ops acp_max98388_ops = {
> diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
> index 9ee4d9926e06..a4c8cbfba096 100644
> --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
> +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
> @@ -236,12 +236,7 @@ static int sst_platform_alloc_stream(struct snd_pcm_substream *substream,
>
>          stream->stream_info.str_id = str_params.stream_id;
>
> -       ret_val = stream->ops->open(sst->dev, &str_params);
> -       if (ret_val <= 0)
> -               return ret_val;
> -
> -
> -       return ret_val;
> +       return stream->ops->open(sst->dev, &str_params);
>   }
>
>   static void sst_period_elapsed(void *arg)
> diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c
> index 2474eb619882..515e4dfc1432 100644
> --- a/sound/soc/samsung/smdk_spdif.c
> +++ b/sound/soc/samsung/smdk_spdif.c
> @@ -130,12 +130,8 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
>                  return ret;
>
>          /* Set S/PDIF uses internal source clock */
> -       ret = snd_soc_dai_set_sysclk(cpu_dai, SND_SOC_SPDIF_INT_MCLK,
> -                                       rclk_rate, SND_SOC_CLOCK_IN);
> -       if (ret < 0)
> -               return ret;
> -
> -       return ret;
> +       return snd_soc_dai_set_sysclk(cpu_dai, SND_SOC_SPDIF_INT_MCLK,
> +                                     rclk_rate, SND_SOC_CLOCK_IN);
>   }
>
>   static const struct snd_soc_ops smdk_spdif_ops = {
> diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
> index e9f092f082a1..b9b2bdff4ccb 100644
> --- a/sound/soc/sof/intel/hda-dsp.c
> +++ b/sound/soc/sof/intel/hda-dsp.c
> @@ -1114,11 +1114,7 @@ static int hda_dsp_s5_quirk(struct snd_sof_dev *sdev)
>          usleep_range(500, 1000);
>
>          /* Restore state for shutdown, back to reset */
> -       ret = hda_dsp_ctrl_link_reset(sdev, true);
> -       if (ret < 0)
> -               return ret;
> -
> -       return ret;
> +       return hda_dsp_ctrl_link_reset(sdev, true);
>   }
>
>   int hda_dsp_shutdown_dma_flush(struct snd_sof_dev *sdev)
> --
> 2.43.0
>