From patchwork Thu Dec 11 17:45:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 5477001 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CA97A9F1D4 for ; Thu, 11 Dec 2014 17:52:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB1E1201C8 for ; Thu, 11 Dec 2014 17:52:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B5A7E201BB for ; Thu, 11 Dec 2014 17:52:18 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D9170265800; Thu, 11 Dec 2014 18:52:17 +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.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 57ACB265707; Thu, 11 Dec 2014 18:48:48 +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 5E6362656FD; Thu, 11 Dec 2014 18:48:46 +0100 (CET) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by alsa0.perex.cz (Postfix) with ESMTP id B39FD26530A for ; Thu, 11 Dec 2014 18:46:47 +0100 (CET) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NGF00GCSIPYI090@mailout4.samsung.com> for alsa-devel@alsa-project.org; Fri, 12 Dec 2014 02:46:46 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-0a-5489d8865264 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3A.4C.09430.688D9845; Fri, 12 Dec 2014 02:46:46 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NGF00MHSIP1T280@mmp1.samsung.com>; Fri, 12 Dec 2014 02:46:46 +0900 (KST) From: Sylwester Nawrocki To: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org Date: Thu, 11 Dec 2014 18:45:46 +0100 Message-id: <1418319952-10163-9-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1418319952-10163-1-git-send-email-s.nawrocki@samsung.com> References: <1418319952-10163-1-git-send-email-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprELMWRmVeSWpSXmKPExsVy+t9jAd22G50hBruvyltcuXiIyWLqwyds Fo/mP2a2mHF+H5PF75vf2SwOv2lntbi44guTA7vHhs9NbB6Lvmd5bFrVyebRt2UVo8fnTXIB rFFcNimpOZllqUX6dglcGSeuXGIv2MpVMa1vF3MD40mOLkZODgkBE4lfV6+zQNhiEhfurWfr YuTiEBJYxChx6ssxFging0ni8YyTrCBVbAKGEr1H+xhBbBEBJ4mZc96DdTALNDNKnP91gwkk ISzgI/F3/2SwBhYBVYkrbT+BbA4OXgE3iWmfxEBMCQEFiTmTbEAqOAXcJdb/Ogd2hBBQxaON DawTGHkXMDKsYhRNLUguKE5KzzXSK07MLS7NS9dLzs/dxAgOqWfSOxhXNVgcYhTgYFTi4c2I 7wwRYk0sK67MPcQowcGsJMK75zJQiDclsbIqtSg/vqg0J7X4EKM0B4uSOK+SfVuIkEB6Yklq dmpqQWoRTJaJg1OqgXHORO5oXak0nZOLwwpmxbYefntwL9dqmUivSR+c1ybeYbFo6+WtZ5s1 c0o6y5yrEpIcJt9/PbIseZpgE1WzuyTH5Pe2rdG1kWWbtx9mP+wSO+fP+/TbBR2mMgLxP3JO n/n15Gfu3X2xPz9biLHU7T3nOsedS/hVrdlyVg99oyu12Ycv8O+cnaLEUpyRaKjFXFScCACn 2JeOJQIAAA== Cc: sbkim73@samsung.com, broonie@kernel.org, drake@endlessm.com, Sylwester Nawrocki , padma.v@samsung.com Subject: [alsa-devel] [PATCH/RFC 08/14] ASoC: samsung: i2s: Remove an unneeded goto usage 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 The usage of this goto seems unjustified, use if/else statement instead. Signed-off-by: Sylwester Nawrocki --- sound/soc/samsung/i2s.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 6501c40..a131621 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -979,19 +979,18 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */ samsung_asoc_init_dma_data(dai, &other->sec_dai->dma_playback, NULL); - goto probe_exit; - } - - samsung_asoc_init_dma_data(dai, &i2s->dma_playback, &i2s->dma_capture); + } else { + samsung_asoc_init_dma_data(dai, &i2s->dma_playback, + &i2s->dma_capture); - if (i2s->quirks & QUIRK_NEED_RSTCLR) - writel(CON_RSTCLR, i2s->addr + I2SCON); + if (i2s->quirks & QUIRK_NEED_RSTCLR) + writel(CON_RSTCLR, i2s->addr + I2SCON); - if (i2s->quirks & QUIRK_SUPPORTS_IDMA) - idma_reg_addr_init(i2s->addr, + if (i2s->quirks & QUIRK_SUPPORTS_IDMA) + idma_reg_addr_init(i2s->addr, i2s->sec_dai->idma_playback.dma_addr); + } -probe_exit: /* Reset any constraint on RFS and BFS */ i2s->rfs = 0; i2s->bfs = 0;