staging: comedi: amplc_pci224: no need to manipulate PCI ref count
authorIan Abbott <abbotti@mev.co.uk>
Thu, 31 Jul 2014 13:47:51 +0000 (14:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 16 Aug 2014 19:23:09 +0000 (12:23 -0700)
This driver no longer supports a "legacy" attach mechanism that searches
for a suitable PCI device and increments it's reference count, but since
the common "detach" handler `pci224_detach()` still has a left-over
`pci_dev_put()`, a matching `pci_dev_get()` is needed in the
"auto_attach" handler `pci224_auto_attach()`.  There is no longer any
reason to "get" and "put" the PCI device, so those calls can be removed.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pci224.c

index 0bf5e68..bcef9e6 100644 (file)
@@ -1196,20 +1196,12 @@ pci224_auto_attach(struct comedi_device *dev, unsigned long context_unused)
                        "BUG! cannot determine board type!\n");
                return -EINVAL;
        }
-       /*
-        * Need to 'get' the PCI device to match the 'put' in pci224_detach().
-        * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-        * support for manual attachment of PCI devices via pci224_attach()
-        * has been removed.
-        */
-       pci_dev_get(pci_dev);
        return pci224_attach_common(dev, pci_dev);
 }
 
 static void pci224_detach(struct comedi_device *dev)
 {
        struct pci224_private *devpriv = dev->private;
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 
        if (dev->irq)
                free_irq(dev->irq, dev);
@@ -1219,8 +1211,6 @@ static void pci224_detach(struct comedi_device *dev)
                kfree(devpriv->ao_scan_order);
        }
        comedi_pci_disable(dev);
-       if (pcidev)
-               pci_dev_put(pcidev);
 }
 
 static struct comedi_driver amplc_pci224_driver = {