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

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


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

Remove the unnecessary read/write of the PLC_INTRCS_REG. The rtd_reset()
function writes '0' to this register.

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/rtd520.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 6fc4ed3..92bf42846 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1361,23 +1361,15 @@ static void rtd_detach(struct comedi_device *dev)
 	struct rtd_private *devpriv = dev->private;
 
 	if (devpriv) {
-		/* Shut down any board ops by resetting it */
-		if (dev->mmio && devpriv->lcfg)
-			rtd_reset(dev);
-		if (dev->irq) {
-			writel(readl(devpriv->lcfg + PLX_INTRCS_REG) &
-				~(ICS_PLIE | ICS_DMA0_E | ICS_DMA1_E),
-				devpriv->lcfg + PLX_INTRCS_REG);
-			free_irq(dev->irq, dev);
+		if (devpriv->lcfg) {
+			if (dev->mmio)
+				rtd_reset(dev);
+			iounmap(devpriv->lcfg);
 		}
-		if (dev->mmio)
-			iounmap(dev->mmio);
 		if (devpriv->las1)
 			iounmap(devpriv->las1);
-		if (devpriv->lcfg)
-			iounmap(devpriv->lcfg);
 	}
-	comedi_pci_disable(dev);
+	comedi_pci_detach(dev);
 }
 
 static struct comedi_driver rtd520_driver = {
-- 
2.0.3



More information about the devel mailing list