From: H Hartley Sweeten Date: Fri, 21 Nov 2014 21:22:29 +0000 (-0700) Subject: staging: comedi: adv_pci1723: remove board reset during (*detach) X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b5ed2b28433e9b8826a30fbc942bc2309dca7031;p=deliverable%2Flinux.git staging: comedi: adv_pci1723: remove board reset during (*detach) The pci1723_reset() function simply resets all the analog output channels to 0V and a +/-10V range. This really isn't necessary when detaching the driver. Remove the board reset and just use comedi_pci_detach() directly for the (*detach). Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index 87f78367fe95..1b59eb2ff4e9 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c @@ -259,18 +259,11 @@ static int pci1723_auto_attach(struct comedi_device *dev, return 0; } -static void pci1723_detach(struct comedi_device *dev) -{ - if (dev->iobase) - pci1723_reset(dev); - comedi_pci_detach(dev); -} - static struct comedi_driver adv_pci1723_driver = { .driver_name = "adv_pci1723", .module = THIS_MODULE, .auto_attach = pci1723_auto_attach, - .detach = pci1723_detach, + .detach = comedi_pci_detach, }; static int adv_pci1723_pci_probe(struct pci_dev *dev,