From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755627AbdKNPro (ORCPT ); Tue, 14 Nov 2017 10:47:44 -0500 Received: from mout.web.de ([212.227.15.14]:57363 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbdKNPrf (ORCPT ); Tue, 14 Nov 2017 10:47:35 -0500 To: alsa-devel@alsa-project.org, Bhumika Goyal , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] ALSA: emu10k1: Use common error handling code in two functions Message-ID: <8c7233f8-c8e5-8b22-5b58-233f7b6cab1d@users.sourceforge.net> Date: Tue, 14 Nov 2017 16:46:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:TxANsCGGJCFA2ZhHmOwJZG1RtzzZtjTtq06t5YebdB33euE5S3Y lEXtFL5c7SgmXS0+CNYmfTfvAk9iFYMWP1NfUMcT8JlzzJXzz81WqsI2NU+CMdI3RcnEcGo gtsWms7NDQC+PKwZUzXKpFf5oPf79s7fKJh8QDzcKRSp13dJ0GYXXY5XpNcbd8N6GMUg9DE qFp7gIYDypJnXU0jMvYoA== X-UI-Out-Filterresults: notjunk:1;V01:K0:UIY6gQcwh4A=:e3As26kZqxjO12EhVpg0YF vT2NHzzpImI8YKvPdfnPBmyF4nW19DUagXqqJUgirO4SuAk+j+uYKz9iJ2NkWjOMzRUpRZSIv LqyupF677F63gIV3FZFnY3HzVC3CnqmIzHMU/m38YYWD1hKPsrNtCLa+fC3qyHDWn7F9EJRwI Uxam9gWC8iB/qapGAxEcv+tfF8nXasIR2EWq4l/jzM/8R6ZBT0P3y2dakQiFwfvHKLABya3ej 1obN5ZX1gBd6qg2kGCTaNxqBxmb9EOnWTWLMTdS2YuRW2LUi2G6SI63zeAexyRu3UqSLt9JOq dtnF50+86V5kFwa9AOcnhKggF3npjyK0nErGBDu/uqU+CX4XQpP4to/TKVhH2V298K1VlltE+ cRx3X+FoPoDpX+ydVlaNZ5NJJO8H+oFVdb4ff0rPX5xhSAPXS6AJyKE7DHrhSPWKjvWWTOy5S VJQalaFQvNCEgFV2RrCQz+jOUkoH/i8rP9MSTjVg7jXZkKNwg6BYDtSt5xtyUpn2HFDlalsra OkRKaP1MGOsqpfbFh3evLdwmH0mx+vWNm4udSvLg6DaP4K1Ux3o/Eg11KhduRM/VSHsr489Gm mz/7n4Xb36jDq/sAyfrq5/+1la/N3hU+mXu7pF2c+yyE6tCTBwwpEJswJFxlDaeBgzM4isEqS 7eLHb425XtZYsyDgS9IcxKFjZgSxzdgMZ9Ly5Drm5qUVDXIaLfL8w6oD6Z9zS1lVqFZtIyktU rng2dzZRQDKQt1olwlVGdIVzxA0rgKo64plcRoAAFE6GP/IsfxBFEiU1rCkzEVhg6oWI5TTe8 VWo7m1iB1Xln+85x8C5geU8sNjcHcJdsHAtWM5fwJO4Cm7CnZc= 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 16:40:32 +0100 * Add jump targets so that a bit of exception handling can be better reused at the end of these functions. 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 ten affected source code places. Signed-off-by: Markus Elfring --- sound/pci/emu10k1/emu10k1x.c | 62 +++++++++++++++++++++----------------------- sound/pci/emu10k1/emupcm.c | 31 +++++++++++++--------- 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 2c2b12a06177..4f700907b566 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -1569,38 +1569,33 @@ static int snd_emu10k1x_probe(struct pci_dev *pci, if (err < 0) return err; - if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_emu10k1x_create(card, pci, &chip); + if (err < 0) + goto free_card; - if ((err = snd_emu10k1x_pcm(chip, 0)) < 0) { - snd_card_free(card); - return err; - } - if ((err = snd_emu10k1x_pcm(chip, 1)) < 0) { - snd_card_free(card); - return err; - } - if ((err = snd_emu10k1x_pcm(chip, 2)) < 0) { - snd_card_free(card); - return err; - } + err = snd_emu10k1x_pcm(chip, 0); + if (err < 0) + goto free_card; - if ((err = snd_emu10k1x_ac97(chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_emu10k1x_pcm(chip, 1); + if (err < 0) + goto free_card; - if ((err = snd_emu10k1x_mixer(chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_emu10k1x_pcm(chip, 2); + if (err < 0) + goto free_card; + + err = snd_emu10k1x_ac97(chip); + if (err < 0) + goto free_card; + + err = snd_emu10k1x_mixer(chip); + if (err < 0) + goto free_card; - if ((err = snd_emu10k1x_midi(chip)) < 0) { - snd_card_free(card); - return err; - } + err = snd_emu10k1x_midi(chip); + if (err < 0) + goto free_card; snd_emu10k1x_proc_init(chip); @@ -1609,14 +1604,17 @@ static int snd_emu10k1x_probe(struct pci_dev *pci, sprintf(card->longname, "%s at 0x%lx irq %i", card->shortname, chip->port, chip->irq); - 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_emu10k1x_remove(struct pci_dev *pci) diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 2683b9717215..088741f90f91 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1143,23 +1143,26 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream) runtime->private_data = epcm; runtime->private_free = snd_emu10k1_pcm_free_substream; runtime->hw = snd_emu10k1_playback; - if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) { - kfree(epcm); - return err; - } - if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) < 0) { - kfree(epcm); - return err; - } + err = snd_pcm_hw_constraint_integer(runtime, + SNDRV_PCM_HW_PARAM_PERIODS); + if (err < 0) + goto free_pcm; + + err = snd_pcm_hw_constraint_minmax(runtime, + SNDRV_PCM_HW_PARAM_BUFFER_BYTES, + 256, + UINT_MAX); + if (err < 0) + goto free_pcm; + if (emu->card_capabilities->emu_model && emu->emu1010.internal_clock == 0) sample_rate = 44100; else sample_rate = 48000; err = snd_pcm_hw_rule_noresample(runtime, sample_rate); - if (err < 0) { - kfree(epcm); - return err; - } + if (err < 0) + goto free_pcm; + mix = &emu->pcm_mixer[substream->number]; for (i = 0; i < 4; i++) mix->send_routing[0][i] = mix->send_routing[1][i] = mix->send_routing[2][i] = i; @@ -1170,6 +1173,10 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream) mix->epcm = epcm; snd_emu10k1_pcm_mixer_notify(emu, substream->number, 1); return 0; + +free_pcm: + kfree(epcm); + return err; } static int snd_emu10k1_playback_close(struct snd_pcm_substream *substream) -- 2.15.0