From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 26 Aug 2014 00:55:52 +0000 (-0700)
Subject: staging: comedi: s626: use comedi_pci_detach()
X-Git-Tag: firefly_0821_release~176^2~3121^2~990
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8075bfb67566376f706baa7cbc6b5b0e3eb99318;p=firefly-linux-kernel-4.4.55.git

staging: comedi: s626: use comedi_pci_detach()

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

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 8778bb88d74d..a868d73f86a3 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2914,13 +2914,8 @@ static void s626_detach(struct comedi_device *dev)
 			writel(S626_MC1_SHUTDOWN, dev->mmio + S626_P_MC1);
 			writel(S626_ACON1_BASE, dev->mmio + S626_P_ACON1);
 		}
-
-		if (dev->irq)
-			free_irq(dev->irq, dev);
-		if (dev->mmio)
-			iounmap(dev->mmio);
 	}
-	comedi_pci_disable(dev);
+	comedi_pci_detach(dev);
 	s626_free_dma_buffers(dev);
 }