diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-07 14:52:48 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 22:56:42 -0700 |
| commit | f78ce5fd1ef5e99290a4251b95b0c27ba7d2db4f (patch) | |
| tree | 18a6e68a76c70048f5f4a85f0df510340e1e4b97 /drivers/staging/comedi/drivers/icp_multi.c | |
| parent | 8e3390725093dfec3143046592ed611b4b7a12e6 (diff) | |
staging: comedi: icp_multi: remove board reset during (*detach)
The icp_multi_reset() function currnelt does the following during the
(*auto_attach) and (*detach) of this driver:
1) disables all interrupts and clears any pending requests
2) resets the analog output channels to 0V (0..5V range)
3) sets all digital output channels to 0
Interrupts are not used by this driver so the disable/clear when
detaching is not necessary.
Depending on the use, reseting the analog and digital outputs when the
driver is detached might not be desireable.
Remove the board reset during the (*detach) and use comedi_pci_detach()
directly.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/icp_multi.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 17cf514f8bc0..b76b594ad038 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -313,18 +313,11 @@ static int icp_multi_auto_attach(struct comedi_device *dev, return 0; } -static void icp_multi_detach(struct comedi_device *dev) -{ - if (dev->mmio) - icp_multi_reset(dev); - comedi_pci_detach(dev); -} - static struct comedi_driver icp_multi_driver = { .driver_name = "icp_multi", .module = THIS_MODULE, .auto_attach = icp_multi_auto_attach, - .detach = icp_multi_detach, + .detach = comedi_pci_detach, }; static int icp_multi_pci_probe(struct pci_dev *dev, |