Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17683535 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: amplc_pci224: no need to manipulate PCI ref count 



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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b2809ef

drivers/staging/comedi/drivers/amplc_pci224.c

+0 −10
Original line number Diff line number Diff line
@@ -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 = {