From patchwork Wed Nov 15 09:29:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10059091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9824C6023A for ; Wed, 15 Nov 2017 09:29:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 984FC28B78 for ; Wed, 15 Nov 2017 09:29:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AB8728B7D; Wed, 15 Nov 2017 09:29:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C76EA29130 for ; Wed, 15 Nov 2017 09:29:38 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E268826756D; Wed, 15 Nov 2017 10:29:36 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E3E5E26756F; Wed, 15 Nov 2017 10:29:35 +0100 (CET) Received: from mout.web.de (mout.web.de [212.227.17.12]) by alsa0.perex.cz (Postfix) with ESMTP id 57B3D266E67 for ; Wed, 15 Nov 2017 10:29:34 +0100 (CET) Received: from [192.168.1.3] ([77.182.217.107]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M9GN8-1eKz4h01HC-00Cgcj; Wed, 15 Nov 2017 10:29:29 +0100 From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , Jaroslav Kysela , Takashi Iwai References: Message-ID: Date: Wed, 15 Nov 2017 10:29:27 +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: Content-Language: en-GB X-Provags-ID: V03:K0:xRNGDJ3Fq0OfDb11KiJy9BRR42JOWaIduCyp9NblKi1gmCe4oQO kYl59WM8fhV5jxFqwQkdPbIqUnM2QxYaERHRVca/LqEKM5vRKgi5HOs2+GMy7366q1eQxMP ZzkNdwWibaDcMCKUq4k3sCdVuMI7qa6JWRPfoJixDjmy9jAhKvrLgXXWjzsrEWP1AZggqzh k/IDGta5tbh4dZzByiLzQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:MVTUlKOS0Dc=:Np+cgR+YHYDoOagSu1mPSv COWDy6ho19Btun8igsS8BUHR/BetaPxd7WDORlHi4e+n7Z9l2ZDcFpfuh07wmI5kGx9mVXvXD EsrgZLtWJ/BTXNXfpFSR0kTbbHPz5xjdhoN3K/NhDarG1+kiARgTjkfQ3/oXny1XcgHOEQy2n 3LXxvc5jErHH9NpQYhcBoOmxntnBtx6cNP8MqVyUWE4kxNK3iv02dRHx9OPinTM/hW8EAqOWP dm5DvhICdopwy4a8R/a1SHcJ4RaDGX1r+AfU7pHStYoGH1NhMNz0+hPm0o8wFkknkTu9dzhFv uObScOaS8Vk0OA5Scfic+HGEipxjc01t6mlaq/KbWUF0pxKwPsTNSXzh9Y+cXoQqmzpOZ+SPO HvPEYLVN9/0sI5rLeL1d8JvsJExkLk7YKRwqfsSn0JtpqA+380J95Njaoggo2VFAd1ueoIkkZ umPyn6tOh+CENIHWtN/TLtadPvvZ13h1v8W9MUGPo2DVOz6xxIFai9DU8D2hMHkWMaSO72o+5 XUIQ3ZWbd20afRGYee3nCu++Kq9uXj9bVQO8vn72XvBJkqAWExEKHXAMXp2iBO5OXySiCnwYJ ZXHnxsufqU5eHcwlOxFnOjttNWxgfKhsKHVrXcN/p97RqWDFhwQBSASblTDVwtPhQ2YT6ZFS/ kyQmZ0SQYzS8SdtcNzXRWFsrVq25jzavzFTzEUYkLcwVaQS/osfwFv0xKy0kkiGmjdxUEj0/e Q29X5UQjRUl74Bnj++IXVr9OdlIgcFtAkbHS0hFD7/dXwYByInS4nY8og1YEdduyovp8pk41k tJdtuNgBQE/2uCXxAh7GQipQf3dB2DcWno+CX1mYwnYLVYy+EA= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH 2/3] ALSA: es1968: Use common error handling code in two functions X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Wed, 15 Nov 2017 09:04:41 +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. Signed-off-by: Markus Elfring --- sound/pci/es1968.c | 66 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index d68980087f93..7777ec583e20 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -2702,14 +2702,14 @@ static int snd_es1968_create(struct snd_card *card, dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) { dev_err(card->dev, "architecture does not support 28bit PCI busmaster DMA\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (! chip) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } /* Set Vars */ @@ -2730,15 +2730,14 @@ static int snd_es1968_create(struct snd_card *card, err = pci_request_regions(pci, "ESS Maestro"); if (err < 0) { kfree(chip); - pci_disable_device(pci); - return err; + goto disable_device; } chip->io_port = pci_resource_start(pci, 0); if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); - snd_es1968_free(chip); - return -EBUSY; + err = -EBUSY; + goto free_sound_chip; } chip->irq = pci->irq; @@ -2775,20 +2774,17 @@ static int snd_es1968_create(struct snd_card *card, snd_es1968_chip_init(chip); err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); - if (err < 0) { - snd_es1968_free(chip); - return err; - } + if (err < 0) + goto free_sound_chip; #ifdef CONFIG_SND_ES1968_RADIO /* don't play with GPIOs on laptops */ if (chip->pci->subsystem_vendor != 0x125d) goto no_radio; err = v4l2_device_register(&pci->dev, &chip->v4l2_dev); - if (err < 0) { - snd_es1968_free(chip); - return err; - } + if (err < 0) + goto free_sound_chip; + chip->tea.v4l2_dev = &chip->v4l2_dev; chip->tea.private_data = chip; chip->tea.radio_nr = radio_nr; @@ -2810,6 +2806,14 @@ static int snd_es1968_create(struct snd_card *card, *chip_ret = chip; return 0; + +disable_device: + pci_disable_device(pci); + return err; + +free_sound_chip: + snd_es1968_free(chip); + return err; } @@ -2849,10 +2853,9 @@ static int snd_es1968_probe(struct pci_dev *pci, use_pm[dev], radio_nr[dev], &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + card->private_data = chip; switch (chip->type) { @@ -2871,16 +2874,12 @@ static int snd_es1968_probe(struct pci_dev *pci, } err = snd_es1968_pcm(chip, 0); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; err = snd_es1968_mixer(chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; if (enable_mpu[dev] == 2) { /* check the black list */ @@ -2923,13 +2922,16 @@ static int snd_es1968_probe(struct pci_dev *pci, card->shortname, chip->io_port, chip->irq); 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_es1968_remove(struct pci_dev *pci)