lkml.org 
[lkml]   [2017]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ASoC: cs4270: Use common error handling code in two functions
Date
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 6 Sep 2017 19:09:31 +0200

Add jump targets so that a bit of exception handling can be better reused
at the end of these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
sound/soc/codecs/cs4270.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 84f86745c30e..aa70d471cc57 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -362,10 +362,8 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
reg |= cs4270_mode_ratios[i].speed_mode;

ret = snd_soc_write(codec, CS4270_MODE, reg);
- if (ret < 0) {
- dev_err(codec->dev, "i2c write failed\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_failure;

/* Set the DAI format */

@@ -385,11 +383,13 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
}

ret = snd_soc_write(codec, CS4270_FORMAT, reg);
- if (ret < 0) {
- dev_err(codec->dev, "i2c write failed\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_failure;
+
+ return ret;

+report_failure:
+ dev_err(codec->dev, "i2c write failed\n");
return ret;
}

@@ -512,10 +512,8 @@ static int cs4270_probe(struct snd_soc_codec *codec)
* re-enabled it by using the controls.
*/
ret = snd_soc_update_bits(codec, CS4270_MUTE, CS4270_MUTE_AUTO, 0);
- if (ret < 0) {
- dev_err(codec->dev, "i2c write failed\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_failure;

/* Disable automatic volume control. The hardware enables, and it
* causes volume change commands to be delayed, sometimes until after
@@ -524,15 +522,17 @@ static int cs4270_probe(struct snd_soc_codec *codec)
*/
ret = snd_soc_update_bits(codec, CS4270_TRANS,
CS4270_TRANS_SOFT | CS4270_TRANS_ZERO, 0);
- if (ret < 0) {
- dev_err(codec->dev, "i2c write failed\n");
- return ret;
- }
+ if (ret < 0)
+ goto report_failure;

ret = regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
cs4270->supplies);

return ret;
+
+report_failure:
+ dev_err(codec->dev, "i2c write failed\n");
+ return ret;
}

/**
--
2.14.1
\
 
 \ /
  Last update: 2017-09-06 19:36    [W:0.051 / U:3.612 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site