[PATCH 11/16] staging: comedi: s626: use comedi_pci_detach()
H Hartley Sweeten
hsweeten at visionengravers.com
Mon Aug 4 22:55:38 UTC 2014
Use comedi_pci_detach() to handle the boilerplate part of the (*detach)
for this PCI driver.
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/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
More information about the devel
mailing list