From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966823AbdKRPdk (ORCPT ); Sat, 18 Nov 2017 10:33:40 -0500 Received: from mout.web.de ([212.227.17.11]:64468 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966545AbdKRPda (ORCPT ); Sat, 18 Nov 2017 10:33:30 -0500 Subject: [PATCH 2/3] ALSA: sonicvibes: Use common error handling code in snd_sonic_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , David Howells , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <663ac54c-baf9-ac11-50fd-d8b407d1eacf@users.sourceforge.net> Message-ID: <89664efb-8306-cd4f-a217-bf0a2ddba142@users.sourceforge.net> Date: Sat, 18 Nov 2017 16:32:16 +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: <663ac54c-baf9-ac11-50fd-d8b407d1eacf@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:a6mzyQ2AJssx5+2OGalmWxc6RGSPRYLvZMM7LlGlxNASyGGgSFM sZjTy9bzlRaPKxY8BEtXszQ8ESsygW9X7lY5zmD54RpBRCOC7xt7CaTEvwCUwVAl04YbnPX x0deaqOmDmQ8hWsHzrQhJT3FvLrCH4DWzfH92jB4ykGV3hYb2uhQEEb800g1g+vZpifkuOU QVHXm5VzDFEX6/hIw7jCw== X-UI-Out-Filterresults: notjunk:1;V01:K0:brj4RDE7TOg=:dRe6M4x5wGy3v9G65rJ+52 LKNON5pD5h8llLibPZ+hPyzBIShooaJWUwPUSODe1Pf1iQ4DspIusUma6VYJjKNqh/UQbgU9j sPnRzdeTPhkqcfBuoN189O/rvyZilT5eJd9eEx7I18vXoJTsZo98oQQBuWhxc1wqg440uiwn5 yMRlcHWkezpVewj8T6oZEkGhAy/lvyl6DuB2+Ln+tDka8PhUKojBZBND5wJ5nIxLSj3SjfXSG oxZhIUMKsDH+Dw1yjnCo73xaPNlfRTuqZqCnp7OEDWI3MlpZCjS9tGGOL3eqDBVVBMT3G9Sq/ 4tck7o/yKkh3YylLE0sF1vzMMpAAqKVAWnfHHah9GFdEq0/7wNPjNYGOXJqxIGprZ9ruZzDFG AFck5bk9MRQYMZqZFOmKub9zwiDMN8e0Vne4FKRvPVmyuwQAilPD7kSiPFhz5MvhjBkudFu3L aZtrl3V6agsWN01/WVqK/FeHnExgeBR9vRlRYOQ3OGooV4cg+t9af55Uz+rN2V85hY5BkP8Xm G3k4I2aLFlMnRIn+MQNHEDHisRAdxQdMho1nKOMqXp0iyS3cVnDk+CqtYCkl4S/QLVT+v2dZB wKlkDao1WuaGdUV3/xvBOYUiMnzTFK2eFQDpCKgLJ4bSdyePBEdhP06ytDrK24sODh/f2QvAd +UWuLsIuezSlekhS46j3cCLkCBBbzy0gsSNC4PvA44leLKxcyWb7/TYv3mEzwJnAw/EOBGfwc gj68L1gBR6k/zGfvxOkge24wJqw9etTgkOuo8l/RLg8cMyLRcO66b+ZDJ0/4PVC1HTBVChNSj +OXlyv5BJhXNu/DNbx0Y3oahpHQVOaSeRgGSI72vQz0LmVE3LA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 18 Nov 2017 16:10:34 +0100 Add a jump target 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/sonicvibes.c | 54 ++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index 7c238d908031..75fc64839df0 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c @@ -1478,17 +1478,15 @@ static int snd_sonic_probe(struct pci_dev *pci, for (idx = 0; idx < 5; idx++) { if (pci_resource_start(pci, idx) == 0 || !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) { - snd_card_free(card); - return -ENODEV; + err = -ENODEV; + goto free_card; } } err = snd_sonicvibes_create(card, pci, reverb[dev] ? 1 : 0, mge[dev] ? 1 : 0, &sonic); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; strcpy(card->driver, "SonicVibes"); strcpy(card->shortname, "S3 SonicVibes"); @@ -1499,48 +1497,44 @@ static int snd_sonic_probe(struct pci_dev *pci, sonic->irq); err = snd_sonicvibes_pcm(sonic, 0); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = snd_sonicvibes_mixer(sonic); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES, sonic->midi_port, MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK, -1, &midi_uart); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + snd_sonicvibes_midi(sonic, midi_uart); err = snd_opl3_create(card, sonic->synth_port, sonic->synth_port + 2, OPL3_HW_OPL3_SV, 1, &opl3); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; snd_sonicvibes_create_gameport(sonic); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; pci_set_drvdata(pci, card); dev++; return 0; + +free_card: + snd_card_free(card); + return err; } static void snd_sonic_remove(struct pci_dev *pci) -- 2.15.0