| Message ID | 8c4e72ae-7606-a4c8-3d53-42364d7edbb2@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Nov 19, 2017 at 3:08 PM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sun, 19 Nov 2017 15:00:22 +0100 > > * Add a jump target so that a specific error message is stored only once > at the end of this function implementation. > > * Replace two calls of the macro "pr_err" by goto statements. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > sound/soc/samsung/bells.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c > index 34deba461ae1..fc9a71523b3e 100644 > --- a/sound/soc/samsung/bells.c > +++ b/sound/soc/samsung/bells.c > @@ -120,18 +120,14 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, > switch (level) { > case SND_SOC_BIAS_STANDBY: > ret = snd_soc_codec_set_pll(codec, WM5102_FLL1, 0, 0, 0); > - if (ret < 0) { > - pr_err("Failed to stop FLL: %d\n", ret); > - return ret; > - } > + if (ret < 0) > + goto report_failure; > No. The same as previously - just for error path code this makes code less readable. Best regards, Krzysztof
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c index 34deba461ae1..fc9a71523b3e 100644 --- a/sound/soc/samsung/bells.c +++ b/sound/soc/samsung/bells.c @@ -120,18 +120,14 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, switch (level) { case SND_SOC_BIAS_STANDBY: ret = snd_soc_codec_set_pll(codec, WM5102_FLL1, 0, 0, 0); - if (ret < 0) { - pr_err("Failed to stop FLL: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; if (bells->asyncclk_rate) { ret = snd_soc_codec_set_pll(codec, WM5102_FLL2, 0, 0, 0); - if (ret < 0) { - pr_err("Failed to stop FLL: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_failure; } break; @@ -142,6 +138,10 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, dapm->bias_level = level; return 0; + +report_failure: + pr_err("Failed to stop FLL: %d\n", ret); + return ret; } static int bells_late_probe(struct snd_soc_card *card)