]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: amplc_pc236: no need to manipulate PCI ref count
authorIan Abbott <abbotti@mev.co.uk>
Fri, 25 Jul 2014 09:04:50 +0000 (10:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Jul 2014 18:28:38 +0000 (11:28 -0700)
Now that this driver no longer supports "manual" attachment of PCI
devices in its `attach` hook (`pc236_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>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pc236.c

index 7331ae3cac9c095e0622912f8290ba21a1b06f30..cf45c58a1c460c051e13a3808e814e4831f45d21 100644 (file)
@@ -417,13 +417,6 @@ static int pc236_auto_attach(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 pc236_detach().
-        * TODO: Remove the pci_dev_get() and matching pci_dev_put() once
-        * support for manual attachment of PCI devices via pc236_attach()
-        * has been removed.
-        */
-       pci_dev_get(pci_dev);
        return pc236_pci_common_attach(dev, pci_dev);
 }
 
@@ -438,13 +431,9 @@ static void pc236_detach(struct comedi_device *dev)
        if (is_isa_board(thisboard)) {
                comedi_legacy_detach(dev);
        } else if (is_pci_board(thisboard)) {
-               struct pci_dev *pcidev = comedi_to_pci_dev(dev);
-
                if (dev->irq)
                        free_irq(dev->irq, dev);
                comedi_pci_disable(dev);
-               if (pcidev)
-                       pci_dev_put(pcidev);
        }
 }