2015-11-25 08:10:37

by Raphael Poggi

Subject: [PATCH v2] sound: codecs: pcm1792a: clean function exit

Signed-off-by: Raphael Poggi <[email protected]>
---
sound/soc/codecs/pcm1792a.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
index 08bb486..27d54bc 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;
-
- return 0;
}

static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
@@ -107,7 +102,7 @@ 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;

priv->rate = params_rate(params);

@@ -145,12 +140,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,

val = val << PCM1792A_FMT_SHIFT | PCM1792A_ATLD_ENABLE;

- ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
+ return regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val);
- if (ret < 0)
- return ret;
-
- return 0;
}

static const struct snd_soc_dai_ops pcm1792a_dai_ops = {
--
2.1.0

2015-11-25 08:18:48

by Michael Nazzareno Trimarchi

Subject: Re: [PATCH v2] sound: codecs: pcm1792a: clean function exit

Hi

On Wed, Nov 25, 2015 at 9:10 AM, Raphael Poggi <[email protected]> wrote:
> Signed-off-by: Raphael Poggi <[email protected]>
> ---
> sound/soc/codecs/pcm1792a.c | 15 +++------------
> 1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
> index 08bb486..27d54bc 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;
> -
> - return 0;
> }
>
> static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
> @@ -107,7 +102,7 @@ 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;
>
> priv->rate = params_rate(params);
>
> @@ -145,12 +140,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
>
> val = val << PCM1792A_FMT_SHIFT | PCM1792A_ATLD_ENABLE;
>
> - ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
> + return regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
> PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val);
> - if (ret < 0)
> - return ret;
> -
> - return 0;
> }
>
> static const struct snd_soc_dai_ops pcm1792a_dai_ops = {
> --
> 2.1.0
>

It's fine for me

reviewed-by: Michael Trimarchi <[email protected]>


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

2015-12-14 11:49:30

by Raphael Poggi

Subject: Re: [PATCH v2] sound: codecs: pcm1792a: clean function exit

ping ?

2015-11-25 9:18 GMT+01:00 Michael Trimarchi <[email protected]>:
> Hi
>
> On Wed, Nov 25, 2015 at 9:10 AM, Raphael Poggi <[email protected]> wrote:
>> Signed-off-by: Raphael Poggi <[email protected]>
>> ---
>> sound/soc/codecs/pcm1792a.c | 15 +++------------
>> 1 file changed, 3 insertions(+), 12 deletions(-)
>>
>> diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
>> index 08bb486..27d54bc 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;
>> -
>> - return 0;
>> }
>>
>> static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
>> @@ -107,7 +102,7 @@ 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;
>>
>> priv->rate = params_rate(params);
>>
>> @@ -145,12 +140,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream,
>>
>> val = val << PCM1792A_FMT_SHIFT | PCM1792A_ATLD_ENABLE;
>>
>> - ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
>> + return regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL,
>> PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val);
>> - if (ret < 0)
>> - return ret;
>> -
>> - return 0;
>> }
>>
>> static const struct snd_soc_dai_ops pcm1792a_dai_ops = {
>> --
>> 2.1.0
>>
>
> It's fine for me
>
> reviewed-by: Michael Trimarchi <[email protected]>
>
>
> --
> | Michael Nazzareno Trimarchi Amarula Solutions BV |
> | COO - Founder Cruquiuskade 47 |
> | +31(0)851119172 Amsterdam 1018 AM NL |
> | [`as] http://www.amarulasolutions.com |
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/