staging: comedi: das08: No need to manipulate PCI ref count
authorIan Abbott <abbotti@mev.co.uk>
Wed, 5 Sep 2012 10:02:39 +0000 (11:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Sep 2012 18:58:24 +0000 (11:58 -0700)
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 <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/das08.c

index 70ad8af524880d65d59f87fac0f18fdd613a89f1..2614961bb14fda21733486701acc599dd87c9499 100644 (file)
@@ -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);
                }
        }
 }