Skip to contentSkip to conversation

sound: codecs: pcm1792a: clean function exit

PATCH In review Raphael Poggi 2 participants 3 messages Nov 25, 2015 – Dec 14, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sound: codecs: pcm1792a: clean function exit

---
 sound/soc/codecs/pcm1792a.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
sound/soc/codecs/pcm1792a.c +3 -12
index 08bb486..27d54bc 100644
@@ -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 = {
Signature · 1 line
2.1.0
Reviewed-by on v2 1/1
#1 lore raw

Hi

Quoted 49 lines · Raphael Poggi
---
 sound/soc/codecs/pcm1792a.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
sound/soc/codecs/pcm1792a.c +3 -13
index 08bb486..27d54bc 100644
@@ -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 = {
--
Quoted 2 lines

2.1.0

It's fine for me

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

ping ?

2015-11-25 9:18 GMT+01:00 Michael Trimarchi <[email protected]>:

Quoted 70 lines

Hi

Quoted 49 lines · Raphael Poggi
---
 sound/soc/codecs/pcm1792a.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
sound/soc/codecs/pcm1792a.c +3 -13
index 08bb486..27d54bc 100644
@@ -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 = {
--
Quoted 2 lines

2.1.0

It's fine for me

--

| 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/