diff mbox

[09/14] ASoC: max9867: remove unused ‘ret’

Message ID 1481218297-17568-10-git-send-email-vinod.koul@intel.com (mailing list archive)
State Accepted
Commit 9fe78b2888ad8bf52536658835c794483e4ac8da
Headers show

Commit Message

Vinod Koul Dec. 8, 2016, 5:31 p.m. UTC 
In max9867_dai_set_fmt(), 'ret' is initialized as return value of
regmap_raw_write() but never checked, so remove this and assignement.

sound/soc/codecs/max9867.c: In function ‘max9867_dai_set_fmt’:
sound/soc/codecs/max9867.c:312:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
  int ret;

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/codecs/max9867.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Fabio Estevam Dec. 8, 2016, 10:48 p.m. UTC | #1 
On Thu, Dec 8, 2016 at 3:31 PM, Vinod Koul <vinod.koul@intel.com> wrote:

> -       ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
> -       ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
> +       regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
> +       regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);

What about doing like this instead?

ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
if (ret)
    return ret;

ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
if (ret)
  return ret;

return 0;
Vinod Koul Dec. 9, 2016, 6:56 a.m. UTC | #2 
On Thu, Dec 08, 2016 at 08:48:49PM -0200, Fabio Estevam wrote:
> On Thu, Dec 8, 2016 at 3:31 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> 
> > -       ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
> > -       ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
> > +       regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
> > +       regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
> 
> What about doing like this instead?
> 
> ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
> if (ret)
>     return ret;
> 
> ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
> if (ret)
>   return ret;

yeah we can, but I didn't want to add/remove anything from this code, so
skipped the return which has same effect as previous code.

Btw should regmap_write() return be strictly checked or not?

Thanks
Mark Brown Dec. 15, 2016, 11:22 a.m. UTC | #3 
On Fri, Dec 09, 2016 at 12:26:13PM +0530, Vinod Koul wrote:

> Btw should regmap_write() return be strictly checked or not?

Ideally but it's a lot of work and very rarely fails in practice so...
diff mbox

Patch

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 42e2e407e287..6cdf15ab46de 100644
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -309,7 +309,6 @@  static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
 	struct snd_soc_codec *codec = codec_dai->codec;
 	struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec);
 	u8 iface1A = 0, iface1B = 0;
-	int ret;
 
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
 	case SND_SOC_DAIFMT_CBM_CFM:
@@ -346,8 +345,8 @@  static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
 		return -EINVAL;
 	}
 
-	ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
-	ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
+	regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
+	regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
 	return 0;
 }