From: Takashi Iwai Subject: Re: [PATCH] fm801: move to pcim_* and devm_* functions Date: Wed, 07 Jan 2015 08:11:11 +0100 Message-ID: References: <1420587617-28521-1-git-send-email-andy.shevchenko@gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id D7A3A2619E6 for ; Wed, 7 Jan 2015 08:11:11 +0100 (CET) In-Reply-To: <1420587617-28521-1-git-send-email-andy.shevchenko@gmail.com> 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 To: Andy Shevchenko Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Wed, 7 Jan 2015 01:40:17 +0200, Andy Shevchenko wrote: > > The managed functions allow to get ->probe() and ->remove() simplier. > This patch converts code to use managed functions. This doesn't work well because of the order of release calls in device_release(). devres_release_all() is called at first before anything else. Thus the card's free callback would be called after it, and snd_fm801_free() touches the hardware before disabling. Takashi > While here remove the dead code and fix the value printed in error > message. > > Signed-off-by: Andy Shevchenko > --- > sound/pci/fm801.c | 29 +++++++---------------------- > 1 file changed, 7 insertions(+), 22 deletions(-) > > diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c > index dcda3c1..2708500 100644 > --- a/sound/pci/fm801.c > +++ b/sound/pci/fm801.c > @@ -1178,12 +1178,8 @@ static int snd_fm801_free(struct fm801 *chip) > v4l2_device_unregister(&chip->v4l2_dev); > } > #endif > - if (chip->irq >= 0) > - free_irq(chip->irq, chip); > pci_release_regions(chip->pci); > - pci_disable_device(chip->pci); > > - kfree(chip); > return 0; > } > > @@ -1206,28 +1202,23 @@ static int snd_fm801_create(struct snd_card *card, > }; > > *rchip = NULL; > - if ((err = pci_enable_device(pci)) < 0) > + if ((err = pcim_enable_device(pci)) < 0) > return err; > - chip = kzalloc(sizeof(*chip), GFP_KERNEL); > - if (chip == NULL) { > - pci_disable_device(pci); > + chip = devm_kzalloc(&pci->dev, sizeof(*chip), GFP_KERNEL); > + if (chip == NULL) > return -ENOMEM; > - } > spin_lock_init(&chip->reg_lock); > chip->card = card; > chip->pci = pci; > chip->irq = -1; > chip->tea575x_tuner = tea575x_tuner; > - if ((err = pci_request_regions(pci, "FM801")) < 0) { > - kfree(chip); > - pci_disable_device(pci); > + if ((err = pci_request_regions(pci, "FM801")) < 0) > return err; > - } > chip->port = pci_resource_start(pci, 0); > if ((tea575x_tuner & TUNER_ONLY) == 0) { > - if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED, > - KBUILD_MODNAME, chip)) { > - dev_err(card->dev, "unable to grab IRQ %d\n", chip->irq); > + if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt, > + IRQF_SHARED, KBUILD_MODNAME, chip)) { > + dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); > snd_fm801_free(chip); > return -EBUSY; > } > @@ -1242,12 +1233,6 @@ static int snd_fm801_create(struct snd_card *card, > /* init might set tuner access method */ > tea575x_tuner = chip->tea575x_tuner; > > - if (chip->irq >= 0 && (tea575x_tuner & TUNER_ONLY)) { > - pci_clear_master(pci); > - free_irq(chip->irq, chip); > - chip->irq = -1; > - } > - > if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { > snd_fm801_free(chip); > return err; > -- > 1.8.3.101.g727a46b >