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

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/s626.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c 
b/drivers/staging/comedi/drivers/s626.c
index 304be83..d8d25cb 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2922,13 +2922,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);
 }
 
-- 
2.0.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to