]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: amplc_dio200: no need to manipulate PCI ref count
authorIan Abbott <abbotti@mev.co.uk>
Wed, 24 Oct 2012 15:47:47 +0000 (16:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Oct 2012 22:25:10 +0000 (15:25 -0700)
Now that this driver no longer supports "manual" attachment of PCI
devices in its `attach` hook (`dio200_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 <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_dio200.c

index c07f86b7a4a37732b2fec2142512ab83dab07e72..06550c999bacde3653733401bef419ff9577e32a 100644 (file)
@@ -1339,13 +1339,6 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
                dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
                return -EINVAL;
        }
-       /*
-        * Need to 'get' the PCI device to match the 'put' in dio200_detach().
-        * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-        * support for manual attachment of PCI devices via dio200_attach()
-        * has been removed.
-        */
-       pci_dev_get(pci_dev);
        return dio200_pci_common_attach(dev, pci_dev);
 }
 
@@ -1384,7 +1377,6 @@ static void dio200_detach(struct comedi_device *dev)
                if (pcidev) {
                        if (dev->iobase)
                                comedi_pci_disable(pcidev);
-                       pci_dev_put(pcidev);
                }
        }
 }