From: Raphael Poggi <poggi.raph@gmail.com>
To: michael@amarulasolutions.com, perex@perex.cz, tiwai@suse.com
Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
Raphael Poggi <poggi.raph@gmail.com>
Subject: [PATCH v2] sound: codecs: pcm1792a: clean function exit
Date: Wed, 25 Nov 2015 09:10:09 +0100 [thread overview]
Message-ID: <1448439009-9778-1-git-send-email-poggi.raph@gmail.com> (raw)
Signed-off-by: Raphael Poggi <poggi.raph@gmail.com>
---
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
next reply other threads:[~2015-11-25 8:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 8:10 Raphael Poggi [this message]
2015-11-25 8:18 ` [PATCH v2] sound: codecs: pcm1792a: clean function exit Michael Trimarchi
2015-12-14 11:48 ` Raphaël Poggi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448439009-9778-1-git-send-email-poggi.raph@gmail.com \
--to=poggi.raph@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@amarulasolutions.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox