From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752650AbdIFTrq (ORCPT ); Wed, 6 Sep 2017 15:47:46 -0400 Received: from mout.web.de ([212.227.15.3]:58190 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbdIFTro (ORCPT ); Wed, 6 Sep 2017 15:47:44 -0400 Subject: [PATCH 1/3] ALSA: ymfpci: Use common error handling code in snd_card_ymfpci_probe() From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , David Howells , Ingo Molnar , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: Date: Wed, 6 Sep 2017 21:46:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:fwZJvL99+a1UrrhTaK/WQr2UGW//1PCijshV62sgHUystoBAq0Y FcF7jd4YQxGcjX8NS+/Shdv6jUi3W4hJwhcp2766r0FN7hVOPA5giAl7jtRqArnCr60QMw7 bthgWxD20Itt9DtvTIB/an02OGAWLcwTDd6+QtZN3kHLRc2bvkuxAh92YehJ/LhpoeognmT NT768F6IzqlnjuNbO8BAQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:eJgt53oQ3+g=:G2nwhNII5ExOB4L2YlJhy5 GttbYJcpH2zEvhMEtzNI6AdlsOGD7bpwxj4o4DrupjjINbCln6oGmjv49CidpJCETI0QXfKTk mQczyBNFsebrqAZOXa93qCb1QIoah3a+DBc/DO/D/grkNVYTVW15A1sQCFPE+x6iUrhwntgnj 1YI6d/pA3KBpFnuppB9YzCG4g+5/iU9CskwXv2JRybn8xJK6oEs7HOIwJZrqofWDftaqXGKaO ttiRMCGDhn05wPbtTAliG03a3ZzHoms07P+y6ZcGop0nVO10cm6KKBlWOElm44FQp70O62BSR rTB1LrVU9hiTOgfHv4SZXn8l6FnFAW7CWNk57Ih6+qPU96pDZqIobGFutU8/z51lhfyKMMdHM NL/NSXKO35N8ZJiuYmcXFWIQS9IPb/D8d2AdZrsfVX/w1xtE7lhlUZu6664r1d32YT00GRrVd 8Kdu4jEarJzLXzg4Z+mWsyrt5OO7J1eObOhpDYgYY6MUm1h9y+X8fAFjtYzarzbjazSJkR665 oYs+tjqarXkiknWoaU9/xEO8g2mmNAQfagObRQN1W8lyEm4NqdV1cHKMnXhtcXIerNqusmog/ A/lPKszzTGqZWijGw6cyEz9w6+thU6eKq7GXspiPWeuNZmGPHNImqTr9H5Rjr3juh5C4j8z7Q O2J2i7osvoRPLU4tRPTzDyqSSrC74m9LNyLfkiq1siTmfFrR75ufVr7DiHmt4as4QvTmUwLh4 28C0k+PTz/MecWC/EkdKlu2e4vB0iaZSLdWrs7INTPiS9uhdDMGRjQzc9cfwKPi7Icc9imdOS MZozlf2NcnPh3xxpqXNIv2cqMrxx6/4sbLQXwU9Rowy42fhKYk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 6 Sep 2017 20:45:11 +0200 * 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. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix a few source code places. Signed-off-by: Markus Elfring --- sound/pci/ymfpci/ymfpci.c | 62 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 4faf3e1ed06a..eafdee384059 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c @@ -268,10 +268,9 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, if ((err = snd_ymfpci_create(card, pci, old_legacy_ctrl, &chip)) < 0) { - snd_card_free(card); release_and_free_resource(mpu_res); release_and_free_resource(fm_res); - return err; + goto free_card; } chip->fm_res = fm_res; chip->mpu_res = mpu_res; @@ -283,35 +282,31 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, card->shortname, chip->reg_area_phys, chip->irq); - if ((err = snd_ymfpci_pcm(chip, 0)) < 0) { - snd_card_free(card); - return err; - } - if ((err = snd_ymfpci_pcm_spdif(chip, 1)) < 0) { - snd_card_free(card); - return err; - } + err = snd_ymfpci_pcm(chip, 0); + if (err < 0) + goto free_card; + + err = snd_ymfpci_pcm_spdif(chip, 1); + if (err < 0) + goto free_card; + err = snd_ymfpci_mixer(chip, rear_switch[dev]); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + if (chip->ac97->ext_id & AC97_EI_SDAC) { err = snd_ymfpci_pcm_4ch(chip, 2); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = snd_ymfpci_pcm2(chip, 3); - if (err < 0) { - snd_card_free(card); - return err; - } - } - if ((err = snd_ymfpci_timer(chip, 0)) < 0) { - snd_card_free(card); - return err; + if (err < 0) + goto free_card; } + err = snd_ymfpci_timer(chip, 0); + if (err < 0) + goto free_card; + if (chip->mpu_res) { if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI, mpu_port[dev], @@ -336,21 +331,24 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, legacy_ctrl &= ~YMFPCI_LEGACY_FMEN; pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl); } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { - snd_card_free(card); dev_err(card->dev, "cannot create opl3 hwdep\n"); - return err; + goto free_card; } } snd_ymfpci_create_gameport(chip, dev, legacy_ctrl, legacy_ctrl2); - if ((err = snd_card_register(card)) < 0) { - snd_card_free(card); - return err; - } + err = snd_card_register(card); + 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_card_ymfpci_remove(struct pci_dev *pci) -- 2.14.1