From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756092AbdKNRtQ (ORCPT ); Tue, 14 Nov 2017 12:49:16 -0500 Received: from mout.web.de ([212.227.15.4]:57573 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752417AbdKNRtG (ORCPT ); Tue, 14 Nov 2017 12:49:06 -0500 Subject: [PATCH 3/3] ALSA: ens1370: Use common error handling code in snd_ensoniq_create() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , Colin Ian King , David Howells , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <8bcf1ada-f44c-cb83-0890-adc8ae8edda0@users.sourceforge.net> Message-ID: <0cec4a4f-5ba5-d88b-ae04-b2a4be948dfe@users.sourceforge.net> Date: Tue, 14 Nov 2017 18:48:23 +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: <8bcf1ada-f44c-cb83-0890-adc8ae8edda0@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:NRId8qvVBuF023b+S+6pXwvj1T0joi9oaVjl94cRCm6WhPljZRp b9WNBBWgS173JwEL0YZ3srm6E18Ep31LPQRSlqLSxkrazU0gLI3SxZUrdS5k+G81HpOQfzc w7svpH39umKzeLwCdQN2LGLnz7NUoJ/e2i5HlTuIkbAYjZvioKZWUaftH7ZgwEeHOMfb1L+ 4MEjsVNV97VgOBc9KTmmw== X-UI-Out-Filterresults: notjunk:1;V01:K0:og++dHSs3fw=:wyZn/gS/gXhf+oNqpPF4br v7t8ZkrsWT2hhjz9JDrZOcKzRyBd3vSxm3SYWYSZEHgj2rh/UMJKA5hGBe5UOzmQN2NYHvykK M4CCEokDYvqhiGSYEaf4N21aukd4cGLio+ZmE+e3Vg44iBnuD8MzsesTsAQpxZYv3/mh8uTCB mvP55sC7/XJBpJmMWJdU7+yzdROViO+OjU2p1uhC8EPSC/2Pah6oQTlmKTzeZ5yMP2ew4O+pT gtZvLWQ8E2x1cYzbDOIRuOHkvJDnA7dgk1LLqWElA+JkB+Dfhx0evX5hzYEjJEHN1yGDQZ0NU Mr+Du9cv3eYaKFF40HesKJ9GgWPMzfKjadmIKR5IjUWjX1GC6+/5zVtvT11Nxt7wElM+ZTjR+ b3vwUa/2C69N2KPoQh7SEqoO7FiDyyupaUu52CorORioXdhZEa7iae/jOBjYZafIjTXL+Nq54 mjvpokmjaKIGzgHr8XDqJhL1bfSjd026/5u6yh4TmxdgHhdiwU46Ax0678QgaX5XNn4drr4wj KPdLcV3IJZarybjMxRb8JQBP2HWfezt3i2rvznHFTPykI6ln2TUsqraspCcP9GMKbecsV8WsT 2BLRHB/HEneUFmw1KRR6MJqHgKnpknMKgFqEOPIOOfghqA85JxCfZLQgthi4pl4aYlhQeMsHl qVeQQIaTVmoKRWdv/m3ok+4M5ta3AkhV1MpbpARBIW9eL7pYvaDzu42ZP4u9SaFwBUrOarU2G Onqg7LI7t+6nJkzUFw33gYTPiq90ra4jUq7h9nRp2h+diZlM/p8NIwhYJGcAIYd8KwO/NmjEe pqaetG++FSKyLExPRzMftzWhr2qKwyr8YzLPSPVfWRRmz5vyG4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 14 Nov 2017 18:28:30 +0100 Add jump targets so that a bit of exception handling can be better reused at the end of this function. Signed-off-by: Markus Elfring --- sound/pci/ens1370.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 55c5173036d3..4b4ca772cafb 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -2097,8 +2097,8 @@ static int snd_ensoniq_create(struct snd_card *card, return err; ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL); if (ensoniq == NULL) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } spin_lock_init(&ensoniq->reg_lock); mutex_init(&ensoniq->src_mutex); @@ -2108,23 +2108,20 @@ static int snd_ensoniq_create(struct snd_card *card, err = pci_request_regions(pci, "Ensoniq AudioPCI"); if (err < 0) { kfree(ensoniq); - pci_disable_device(pci); - return err; + goto disable_device; } ensoniq->port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED, KBUILD_MODNAME, ensoniq)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); - snd_ensoniq_free(ensoniq); - return -EBUSY; + goto e_busy; } ensoniq->irq = pci->irq; #ifdef CHIP1370 if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 16, &ensoniq->dma_bug) < 0) { dev_err(card->dev, "unable to allocate space for phantom area - dma_bug\n"); - snd_ensoniq_free(ensoniq); - return -EBUSY; + goto e_busy; } #endif pci_set_master(pci); @@ -2150,15 +2147,23 @@ static int snd_ensoniq_create(struct snd_card *card, snd_ensoniq_chip_init(ensoniq); err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops); - if (err < 0) { - snd_ensoniq_free(ensoniq); - return err; - } + if (err < 0) + goto free_sound_chip; snd_ensoniq_proc_init(ensoniq); *rensoniq = ensoniq; return 0; + +disable_device: + pci_disable_device(pci); + return err; + +e_busy: + err = -EBUSY; +free_sound_chip: + snd_ensoniq_free(ensoniq); + return err; } /* -- 2.15.0