[alsa-devel] [PATCH 1/4] sound: codecs: pcm1792a: clean function exit

[Michael Trimarchi]

Hi

On Fri, Nov 20, 2015 at 11:09 AM, Raphael Poggi <poggi.raph at gmail.com> wrote:
> From: Raphael Poggi <poggi.raph at gmail.com>
>
> Signed-off-by: Raphael Poggi <poggi.raph at gmail.com>
> ---
>  sound/soc/codecs/pcm1792a.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
> index 08bb486..cf42b24 100644
> --- a/sound/soc/codecs/pcm1792a.c
> +++ b/sound/soc/codecs/pcm1792a.c
> @@ -91,14 +91,9 @@ static int pcm1792a_digital_mute(struct snd_soc_dai *dai, int mute)
>  {
>         struct snd_soc_codec *codec = dai->codec;
>         struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);
> -       int ret;
>
> -       ret = regmap_update_bits(priv->regmap, PCM1792A_SOFT_MUTE,
> +       return regmap_update_bits(priv->regmap, PCM1792A_SOFT_MUTE,
>                                  PCM1792A_MUTE_MASK, !!mute);
> -       if (ret < 0)
> -               return ret;
> -

Ok, I have seen that almost all the codecs use return regmap_upda...

> -       return 0;
>  }
>
>  static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
> @@ -107,7 +102,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
>  {
>         struct snd_soc_codec *codec = dai->codec;
>         struct pcm1792a_private *priv = snd_soc_codec_get_drvdata(codec);
> -       int val = 0, ret;
> +       int val = 0;
> +       int ret = 0;
>
>         priv->rate = params_rate(params);
>
> @@ -147,10 +143,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
>
>         ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
>                                  PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val);
> -       if (ret < 0)
> -               return ret;
>

Please do the same as before

Michael


> -       return 0;
> +       return ret;
>  }
>
>  static const struct snd_soc_dai_ops pcm1792a_dai_ops = {
> --
> 2.1.0
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel



-- 
| Michael Nazzareno Trimarchi                     Amarula Solutions BV |
| COO  -  Founder                                      Cruquiuskade 47 |
| +31(0)851119172                                 Amsterdam 1018 AM NL |
|                  [`as] http://www.amarulasolutions.com               |