From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935638AbdKPPhC (ORCPT ); Thu, 16 Nov 2017 10:37:02 -0500 Received: from mout.web.de ([217.72.192.78]:62216 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933485AbdKPPgy (ORCPT ); Thu, 16 Nov 2017 10:36:54 -0500 Subject: [PATCH 2/2] ALSA: mixart: Use common error handling code in snd_mixart_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arnd Bergmann , Bhumika Goyal , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <6f8ce522-66ac-9740-41fb-2df6ab6f3aec@users.sourceforge.net> Message-ID: Date: Thu, 16 Nov 2017 16:36:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <6f8ce522-66ac-9740-41fb-2df6ab6f3aec@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:b3HSONtYG8R6CbrVikQY97RV0OL45gVGrxiM5jrQCFMBsL3zedU zUS/DPiDBAOW8apXtlnfDPPq7VWJYvcCMG48gCPLn5uEg2dTB/qj2nFUCzagPdTuN8gsS91 Ln7jzLV2m61R48C6s2tjYOE3DXOj1NklbtP7mGH2z6xRy7Lut07tcjOARUJI9de6iEbIzQo tVWolUFi6OCHxvn2a9NZQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:O958l84dgy8=:sHIUnxjOIuKSQHc2wNfL+Y Hg/V0C47fZMfpmbvEA+UgfMsNjonYgl42XeHY6anQUKmezkYpueDOCkQGvZ/BQRNF14z500Co Rb58yX2Snb+tCfHL4L2S7Gq76bHW7cETtpNq1/EnJjLninnyx1MiYG0MIftx3I0eqeYcKO4iE 0Ynq08xJ2r4YkE62KvhdA4TT9UWM+e81OACSO1d/LWYWYLTNemRhmAEL5wxYgy/UpCGhYF5Bv 9GTgGdAwPtYmPWppdBrPwp95dZxuA9uxBD12WnosO6ABskUps3rW746aunX6SsZTdHXnXw0J8 r6S7mveAa1IpL9aCOfIi+pQVs2NC8zUsY3aTFGYaoUxJF+E1c8Q2YtgHUomOaXSnfC1+oc6wb NcmEv082BXcByMJHflTAceyGHkCVCE33AhMZV6jt0k2escq+m1+OjL0AQkZ7RHJPxBdn+dXhc R4NiJyGeVhnrBgRYR30Srk/hHG+f/Ozs/i5Ko1/BhCxPBx5qU8S0no9NgSyzQxl1nwGjDeHVo PtXSqiTKGpCLmNgxKJ7rW4re/2RHr9gylFdwW1YNnkZTUS7py2cvw/w/Q9zx4Zx+USKiljnad CMCOXsDMzuFv8eSLKvFTEUHujbRG8Kfa1Y29CbLxw5JlWiEhSyqOTSwP/dPk16i4OJllHAbXV Q+6jWX76OfdJz4besq6ajDHfNOtaZg/94YyCFSYa9q/sjEGjvugRBBTcUHKp3R/PrfVB1MqcH 0+GfgS+q3UK+hLPojYNy3TvIWsLew76KbzvWWxSVsqGYe1tOGCf5+atMgKpwtEVoZvaRj0G8I J6P+zeHgLs3oOkhFiF/N5/4xkUDahwnrQLBTjRbY4yIczBNZ2o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 16 Nov 2017 16:18:38 +0100 Add jump targets so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/pci/mixart/mixart.c | 61 ++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index ff90a06f775e..928079520502 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -1274,16 +1274,16 @@ static int snd_mixart_probe(struct pci_dev *pci, if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) { dev_err(&pci->dev, "architecture does not support 32bit PCI busmaster DMA\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } /* */ mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); if (! mgr) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } mgr->pci = pci; @@ -1293,8 +1293,7 @@ static int snd_mixart_probe(struct pci_dev *pci, err = pci_request_regions(pci, CARD_NAME); if (err < 0) { kfree(mgr); - pci_disable_device(pci); - return err; + goto disable_device; } for (i = 0; i < 2; i++) { mgr->mem[i].phys = pci_resource_start(pci, i); @@ -1302,8 +1301,8 @@ static int snd_mixart_probe(struct pci_dev *pci, if (!mgr->mem[i].virt) { dev_err(&pci->dev, "unable to remap resource 0x%lx\n", mgr->mem[i].phys); - snd_mixart_free(mgr); - return -EBUSY; + err = -EBUSY; + goto free_sound_chip; } } @@ -1311,8 +1310,8 @@ static int snd_mixart_probe(struct pci_dev *pci, snd_mixart_threaded_irq, IRQF_SHARED, KBUILD_MODNAME, mgr)) { dev_err(&pci->dev, "unable to grab IRQ %d\n", pci->irq); - snd_mixart_free(mgr); - return -EBUSY; + err = -EBUSY; + goto free_sound_chip; } mgr->irq = pci->irq; @@ -1345,8 +1344,7 @@ static int snd_mixart_probe(struct pci_dev *pci, if (err < 0) { dev_err(&pci->dev, "cannot allocate the card %d\n", i); - snd_mixart_free(mgr); - return err; + goto free_sound_chip; } strcpy(card->driver, CARD_NAME); @@ -1359,8 +1357,7 @@ static int snd_mixart_probe(struct pci_dev *pci, err = snd_mixart_create(mgr, card, i); if (err < 0) { snd_card_free(card); - snd_mixart_free(mgr); - return err; + goto free_sound_chip; } if(i==0) { @@ -1369,10 +1366,8 @@ static int snd_mixart_probe(struct pci_dev *pci, } err = snd_card_register(card); - if (err < 0) { - snd_mixart_free(mgr); - return err; - } + if (err < 0) + goto free_sound_chip; } /* init firmware status (mgr->dsp_loaded reset in hwdep_new) */ @@ -1382,10 +1377,9 @@ static int snd_mixart_probe(struct pci_dev *pci, size = PAGE_ALIGN( (MIXART_MAX_STREAM_PER_CARD * MIXART_MAX_CARDS * sizeof(struct mixart_flowinfo)) ); if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), - size, &mgr->flowinfo) < 0) { - snd_mixart_free(mgr); - return -ENOMEM; - } + size, &mgr->flowinfo) < 0) + goto e_nomem; + /* init streaminfo_array */ memset(mgr->flowinfo.area, 0, size); @@ -1393,23 +1387,30 @@ static int snd_mixart_probe(struct pci_dev *pci, size = PAGE_ALIGN( (MIXART_MAX_STREAM_PER_CARD * MIXART_MAX_CARDS * sizeof(struct mixart_bufferinfo)) ); if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), - size, &mgr->bufferinfo) < 0) { - snd_mixart_free(mgr); - return -ENOMEM; - } + size, &mgr->bufferinfo) < 0) + goto e_nomem; + /* init bufferinfo_array */ memset(mgr->bufferinfo.area, 0, size); /* set up firmware */ err = snd_mixart_setup_firmware(mgr); - if (err < 0) { - snd_mixart_free(mgr); - return err; - } + if (err < 0) + goto free_sound_chip; pci_set_drvdata(pci, mgr); dev++; return 0; + +disable_device: + pci_disable_device(pci); + return err; + +e_nomem: + err = -ENOMEM; +free_sound_chip: + snd_mixart_free(mgr); + return err; } static void snd_mixart_remove(struct pci_dev *pci) -- 2.15.0