From patchwork Wed Nov 25 08:10:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Poggi?= X-Patchwork-Id: 7696431 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CBE0DBF90C for ; Wed, 25 Nov 2015 08:11:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CD72208C9 for ; Wed, 25 Nov 2015 08:11:00 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id CC90820893 for ; Wed, 25 Nov 2015 08:10:58 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0A56E265A7F; Wed, 25 Nov 2015 09:10:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0996D2617A4; Wed, 25 Nov 2015 09:10:47 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 347472617AB; Wed, 25 Nov 2015 09:10:44 +0100 (CET) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by alsa0.perex.cz (Postfix) with ESMTP id 1F131261736 for ; Wed, 25 Nov 2015 09:10:37 +0100 (CET) Received: by wmec201 with SMTP id c201so9779571wme.3 for ; Wed, 25 Nov 2015 00:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bpMc2R0CVPZANSma4Ndrie4fijVuNWaLaf1HT/mar54=; b=ymDZ8nj1Jj8iaLhjBSrZjdMW3u+aDpA4f/f6eJuR0ktrjNWJJpMt31JeqR+gjdrFGT iZlbRAErqLGPRZPtqhYHf4py42E9m56fWlWCuTs+rIHhkDGVemSyMjtOjpxyGPCASTFb P8hA0kz7y5OWVd9LhokHhBg34KqfJY936fmw+8ArwiI7rs/pAtQwUczavPAd+fAyJ8lB RyrqScYTxZBDsPWxB0P1uGDXvVre1chKdrfQAMbKBUXzdxI7AdJuUXdGgfU4HozJlpFA NQarIAO0wM1dh0V/GoxTL4S/ezCfzdYUzVT5MeQQV0z1YiYHKAABvbnCXEXynLC/6r22 HKGA== X-Received: by 10.28.8.15 with SMTP id 15mr3004142wmi.50.1448439035136; Wed, 25 Nov 2015 00:10:35 -0800 (PST) Received: from ubuntu.localdomain ([194.167.244.97]) by smtp.gmail.com with ESMTPSA id m185sm5533969wmf.0.2015.11.25.00.10.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Nov 2015 00:10:34 -0800 (PST) From: Raphael Poggi To: michael@amarulasolutions.com, perex@perex.cz, tiwai@suse.com 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 Cc: alsa-devel@alsa-project.org, Raphael Poggi , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH v2] sound: codecs: pcm1792a: clean function exit X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Raphael Poggi reviewed-by: Michael Trimarchi --- 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 = {