From patchwork Sun Jan 4 13:41:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 5563931 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 E84929F162 for ; Sun, 4 Jan 2015 13:42:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B706201E4 for ; Sun, 4 Jan 2015 13:42:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id CAB26201C8 for ; Sun, 4 Jan 2015 13:42:02 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 19C2E2606E0; Sun, 4 Jan 2015 14:42:01 +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,RCVD_IN_SBL, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 5F88226060C; Sun, 4 Jan 2015 14:41:53 +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 2D57E26064C; Sun, 4 Jan 2015 14:41:52 +0100 (CET) Received: from mout.web.de (mout.web.de [212.227.17.12]) by alsa0.perex.cz (Postfix) with ESMTP id 231362605E7 for ; Sun, 4 Jan 2015 14:41:44 +0100 (CET) Received: from [192.168.1.2] ([78.49.107.19]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0Lqleo-1XdfXj0ieo-00eNF2; Sun, 04 Jan 2015 14:41:41 +0100 Message-ID: <54A94313.1070207@users.sourceforge.net> Date: Sun, 04 Jan 2015 14:41:39 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <54A9355F.4050102@users.sourceforge.net> In-Reply-To: <54A9355F.4050102@users.sourceforge.net> X-Provags-ID: V03:K0:NESZ7L0JZyIrfaUcuTPsnxwlZNj+h0IZ3Bd/hYv16oYD/ojTi4L r4I7ZgHD5IwY7trJ7keFzuWHIHc1jvu9DCAkKA0wRwaXPyI9lDVo2Ti3oyvqUu3krafxbEp 9/aI05c1a5LBmKpmeiZSn2mcpAwEk8HVurdvWWu3td3YOB2fQ33z2crWSA5Ug9VFItafXoY YaC+eXr8LzWEDBnuGBX2w== X-UI-Out-Filterresults: notjunk:1; Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH 13/13] ALSA: msnd: Fix centralized exiting from snd_msnd_attach() 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 4 Jan 2015 11:47:17 +0100 Two return statements were used by the snd_msnd_attach() function at source code places where the Linux coding style recommends an alternative approach. Let us improve the affected implementation details with adjustments for corresponding jump targets. Signed-off-by: Markus Elfring --- sound/isa/msnd/msnd_pinnacle.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index e2e940d..0e66e5e 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -552,17 +552,16 @@ static int snd_msnd_attach(struct snd_card *card) return err; } if (request_region(chip->io, DSP_NUMIO, card->shortname) == NULL) { - free_irq(chip->irq, chip); - return -EBUSY; + err = -EBUSY; + goto free_an_irq; } if (!request_mem_region(chip->base, BUFFSIZE, card->shortname)) { printk(KERN_ERR LOGNAME ": unable to grab memory region 0x%lx-0x%lx\n", chip->base, chip->base + BUFFSIZE - 1); - release_region(chip->io, DSP_NUMIO); - free_irq(chip->irq, chip); - return -EBUSY; + err = -EBUSY; + goto release_resource_region; } chip->mappedbase = ioremap_nocache(chip->base, 0x8000); if (!chip->mappedbase) { @@ -570,7 +569,7 @@ static int snd_msnd_attach(struct snd_card *card) ": unable to map memory region 0x%lx-0x%lx\n", chip->base, chip->base + BUFFSIZE - 1); err = -EIO; - goto err_release_region; + goto release_memory_region; } err = snd_msnd_dsp_full_reset(card); @@ -628,9 +627,11 @@ static int snd_msnd_attach(struct snd_card *card) io_unmap: iounmap(chip->mappedbase); -err_release_region: +release_memory_region: release_mem_region(chip->base, BUFFSIZE); +release_resource_region: release_region(chip->io, DSP_NUMIO); +free_an_irq: free_irq(chip->irq, chip); return err; }