staging: comedi: amplc_pci230: no need to manipulate PCI ref count
authorIan Abbott <abbotti@mev.co.uk>
Mon, 1 Sep 2014 11:03:38 +0000 (12:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Sep 2014 18:21:31 +0000 (11:21 -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 `pci230_detach()` still has a left-over
`pci_dev_put()`, a matching `pci_dev_get()` is needed in the
"auto_attach" handler `pci230_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_pci230.c

index 393712c1b13e2b34c1dd8c09e43b1b258bff4334..39fa2f63f14a4b269c45bd90f9f9e081559d9c37 100644 (file)
@@ -2729,23 +2729,12 @@ static int pci230_auto_attach(struct comedi_device *dev,
                        "amplc_pci230: BUG! cannot determine board type!\n");
                return -EINVAL;
        }
-       /*
-        * Need to 'get' the PCI device to match the 'put' in pci230_detach().
-        * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-        * support for manual attachment of PCI devices via pci230_attach()
-        * has been removed.
-        */
-       pci_dev_get(pci_dev);
        return pci230_attach_common(dev, pci_dev);
 }
 
 static void pci230_detach(struct comedi_device *dev)
 {
-       struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-
        comedi_pci_detach(dev);
-       if (pcidev)
-               pci_dev_put(pcidev);
 }
 
 static struct comedi_driver amplc_pci230_driver = {