Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbbKYIKh (ORCPT ); Wed, 25 Nov 2015 03:10:37 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34053 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751291AbbKYIKg (ORCPT ); Wed, 25 Nov 2015 03:10:36 -0500 From: Raphael Poggi To: michael@amarulasolutions.com, perex@perex.cz, tiwai@suse.com Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Raphael Poggi Subject: [PATCH v2] sound: codecs: pcm1792a: clean function exit Date: Wed, 25 Nov 2015 09:10:09 +0100 Message-Id: <1448439009-9778-1-git-send-email-poggi.raph@gmail.com> X-Mailer: git-send-email 2.1.0 X-Antivirus: avast! (VPS 151124-2, 24/11/2015), Outbound message X-Antivirus-Status: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1787 Lines: 56 Signed-off-by: Raphael Poggi --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/