From patchwork Fri Nov 20 10:09:14 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: 7673881 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EBB019F392 for ; Sat, 21 Nov 2015 09:20:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 252FA20584 for ; Sat, 21 Nov 2015 09:20:50 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id E4D5A2055B for ; Sat, 21 Nov 2015 09:20:48 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 13EE72666F7; Sat, 21 Nov 2015 10:20:48 +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, 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 6F7E32608EA; Sat, 21 Nov 2015 10:20:11 +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 1E7C52619BF; Fri, 20 Nov 2015 11:09:50 +0100 (CET) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by alsa0.perex.cz (Postfix) with ESMTP id 54DE6261294 for ; Fri, 20 Nov 2015 11:09:38 +0100 (CET) Received: by wmww144 with SMTP id w144so2403267wmw.1 for ; Fri, 20 Nov 2015 02:09:38 -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:in-reply-to:references; bh=YdntwWGWRneGtEYobTrLYLKZdU7RfZDAaHl/vlkob+8=; b=kCDlTR9CpXMqeyMOfb+RcIPzqntl4nDGYy7Lcfb+k4Go1D4wFFww3T8Bw5eKjgQVMD OArcwL/nUraRK775AtB+fWdrcP7k8EzNN7jhiadfzkP4skWC4fEIxkixT2eg2WqdXVMl Mv+ZjKRJBjziFOnuv1OwcmYkeH/4PN2OXNIN2G7oG03fZsWuuVkL/6iBrq3WOALxA3vQ SoR02X2PEjryhb9rGoJUIns3cWcfeIACS2PJuuxZY00tFGkiAEEAwryR4tyFGVWFtOZf ExAGPLrjUKWd6J9JbuF9kAuhTbkTc996TcCxHP55Aiq/RZwHR7f4VdmABjseNS6F5E+v avnw== X-Received: by 10.194.134.135 with SMTP id pk7mr13584548wjb.111.1448014178165; Fri, 20 Nov 2015 02:09:38 -0800 (PST) Received: from ubuntu.localdomain ([194.167.244.97]) by smtp.gmail.com with ESMTPSA id hw1sm974027wjb.6.2015.11.20.02.09.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Nov 2015 02:09:37 -0800 (PST) From: Raphael Poggi X-Google-Original-From: Raphael Poggi To: perex@perex.cz, tiwai@suse.com Date: Fri, 20 Nov 2015 11:09:14 +0100 Message-Id: <1448014157-36526-2-git-send-email-raphael.poggi@avalun.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1448014157-36526-1-git-send-email-raphael.poggi@avalun.com> References: <1448014157-36526-1-git-send-email-raphael.poggi@avalun.com> X-Antivirus: avast! (VPS 151119-1, 19/11/2015), Outbound message X-Antivirus-Status: Clean X-Mailman-Approved-At: Sat, 21 Nov 2015 10:20:10 +0100 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Raphael Poggi , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 1/4] 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 From: Raphael Poggi Signed-off-by: Raphael Poggi --- sound/soc/codecs/pcm1792a.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c index 08bb486..cf42b24 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,8 @@ 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; + int ret = 0; priv->rate = params_rate(params); @@ -147,10 +143,8 @@ static int pcm1792a_hw_params(struct snd_pcm_substream *substream, ret = regmap_update_bits(priv->regmap, PCM1792A_FMT_CONTROL, PCM1792A_FMT_MASK | PCM1792A_ATLD_ENABLE, val); - if (ret < 0) - return ret; - return 0; + return ret; } static const struct snd_soc_dai_ops pcm1792a_dai_ops = {