From: Ian Abbott Date: Wed, 5 Sep 2012 10:02:39 +0000 (+0100) Subject: staging: comedi: das08: No need to manipulate PCI ref count X-Git-Tag: next-20120906~20^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c396147048fff69d764e5c3d2adca875c7c90a58;p=karo-tx-linux.git staging: comedi: das08: No need to manipulate PCI ref count Now that this driver no longer supports "manual" attachment of PCI devices in its `attach` hook (`das08_attach()`), it no longer has code that searches for a suitable PCI device and increments its reference count. Since the driver no longer has any reason for incrementing and decrementing the PCI device's reference count, the calls to `pci_dev_get()` and `pci_dev_put()` can be removed. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 70ad8af52488..2614961bb14f 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -793,13 +793,6 @@ das08_attach_pci(struct comedi_device *dev, struct pci_dev *pdev) dev_err(dev->class_dev, "BUG! cannot determine board type!\n"); return -EINVAL; } - /* - * Need to 'get' the PCI device to match the 'put' in das08_detach(). - * TODO: Remove the pci_dev_get() and matching pci_dev_put() once - * support for manual attachment of PCI devices via das08_attach() - * has been removed. - */ - pci_dev_get(pdev); devpriv = dev->private; devpriv->pdev = pdev; /* enable PCI device and reserve I/O spaces */ @@ -864,7 +857,6 @@ static void __maybe_unused das08_detach(struct comedi_device *dev) if (devpriv && devpriv->pdev) { if (dev->iobase) comedi_pci_disable(devpriv->pdev); - pci_dev_put(devpriv->pdev); } } }