From patchwork Thu Jan 14 09:00:28 2016 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: 8030731 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 961F0BEEE5 for ; Thu, 14 Jan 2016 09:01:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DFB420490 for ; Thu, 14 Jan 2016 09:01:12 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 125DD20497 for ; Thu, 14 Jan 2016 09:01:07 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E425A265A53; Thu, 14 Jan 2016 10:01:05 +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=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C0E14260523; Thu, 14 Jan 2016 10:00:57 +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 BAE22260524; Thu, 14 Jan 2016 10:00:56 +0100 (CET) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by alsa0.perex.cz (Postfix) with ESMTP id 9ECBC260511 for ; Thu, 14 Jan 2016 10:00:49 +0100 (CET) Received: by mail-wm0-f54.google.com with SMTP id f206so333565812wmf.0 for ; Thu, 14 Jan 2016 01:00:49 -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=yt0VodUHShk7Pob5YjF+eE48eQiva0FL+AnrSXwjjsg=; b=zTfrcCthboMrg4QuIz1LDfUzxkHpoEATO7Xfgn52RorrIFy9G9T/wkzOGDzPCC3yUG L1ShB3BSHmh5d3y+vEgW3BXMKz5qILJGLBPDUtZpt0+wjQ+YoltBfkbXe6S46MP80rx/ 7NDB4Jt36nRhPmfkh8fAG445EtIYwxzvWbDnEksFz/DwH10z/jHyfhSPJmhwhk+mVlHp txjooM1WlUYd8VLoBgLI7wFLH+mEcIZhLW1XdIKGCLIg32ERzlTMCFvYLeeMyZo5EHy6 cGUJ7f8AW2BSdbLHecq6jGPmKa3Kcxo9ceSpjMpC0DFcaqi3dPafk+aUd160L/Opwy/z VPtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yt0VodUHShk7Pob5YjF+eE48eQiva0FL+AnrSXwjjsg=; b=eRNwVcYzmr5eWFy0khBPj7wLrStf7nqnN1A49sAUR2BtzJkSxWQYYjQ+eDbsL06/gv 41faT4eLWbLaRBcAB/tqitjwfV8sX6bTLMFna0wqPq3MhSHuhF0wTlOAHOFQ3gVt+tA/ l0qcsk/eLVw5l98or+uxE7GMnRnW4P44cM2mqypaQ//2Ec0uy5t3uqtfYIl83LmWiPkq BnkaKDEkAl02r+rvrRWkPN+kJgDnOsfVC9Dyp/ok7yH2RwcjSnkmG4PYwLpJuyqZPPVH Sfr77HUM96CvjKbOgif75S7nNBiaS5GJ1TcqkgTqd2pySv7+8+TOhgTYltvlKUKlhOmX g9LA== X-Gm-Message-State: ALoCoQlw5fZcxkOAua4r0ufZI1PShnp8uSabxp+p/7Sckc6Zb/Ptc5zYDZrnG5NSrx1ys6EXQXOZdPHUVxW3AOHvf5icLoW+LQ== X-Received: by 10.194.205.5 with SMTP id lc5mr2692797wjc.163.1452762048373; Thu, 14 Jan 2016 01:00:48 -0800 (PST) Received: from ubuntu.localdomain ([194.167.244.97]) by smtp.gmail.com with ESMTPSA id xx3sm5056677wjc.32.2016.01.14.01.00.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jan 2016 01:00:47 -0800 (PST) From: Raphael Poggi To: broonie@kernel.org, lgirdwood@gmail.com Date: Thu, 14 Jan 2016 10:00:28 +0100 Message-Id: <1452762028-43931-1-git-send-email-poggi.raph@gmail.com> X-Mailer: git-send-email 2.1.0 X-Antivirus: avast! (VPS 160113-1, 13/01/2016), Outbound message X-Antivirus-Status: Clean Cc: alsa-devel@alsa-project.org, michael@amarulasolutions.com, Raphael Poggi Subject: [alsa-devel] [PATCH] sound: codecs: pcm1792x: 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 --- sound/soc/codecs/pcm179x.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index a56c7b7..e04d13c 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -91,14 +91,9 @@ static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); - int ret; - ret = regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE, + return regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE, PCM179X_MUTE_MASK, !!mute); - if (ret < 0) - return ret; - - return 0; } static int pcm179x_hw_params(struct snd_pcm_substream *substream, @@ -107,7 +102,7 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct pcm179x_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 pcm179x_hw_params(struct snd_pcm_substream *substream, val = val << PCM179X_FMT_SHIFT | PCM179X_ATLD_ENABLE; - ret = regmap_update_bits(priv->regmap, PCM179X_FMT_CONTROL, + return regmap_update_bits(priv->regmap, PCM179X_FMT_CONTROL, PCM179X_FMT_MASK | PCM179X_ATLD_ENABLE, val); - if (ret < 0) - return ret; - - return 0; } static const struct snd_soc_dai_ops pcm179x_dai_ops = {