[PATCH 15/16] staging: comedi: gsc_hpdi: use comedi_pci_detach()

H Hartley Sweeten hsweeten at visionengravers.com
Mon Aug 4 22:55:42 UTC 2014


Use comedi_pci_detach() to handle the boilerplate part of the (*detach)
for this PCI driver.

This also fixes a race condition where the interrupt handler is released
before the interrupts are disabled in the hardware.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/gsc_hpdi.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index b4c1c11..0e85984 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -709,17 +709,11 @@ static void gsc_hpdi_detach(struct comedi_device *dev)
 {
 	struct hpdi_private *devpriv = dev->private;
 
-	if (dev->irq)
-		free_irq(dev->irq, dev);
-	if (devpriv) {
-		if (devpriv->plx9080_mmio) {
-			writel(0, devpriv->plx9080_mmio + PLX_INTRCS_REG);
-			iounmap(devpriv->plx9080_mmio);
-		}
-		if (dev->mmio)
-			iounmap(dev->mmio);
+	if (devpriv && devpriv->plx9080_mmio) {
+		writel(0, devpriv->plx9080_mmio + PLX_INTRCS_REG);
+		iounmap(devpriv->plx9080_mmio);
 	}
-	comedi_pci_disable(dev);
+	comedi_pci_detach(dev);
 	gsc_hpdi_free_dma(dev);
 }
 
-- 
2.0.3



More information about the devel mailing list