From: H Hartley Sweeten Date: Mon, 4 Feb 2013 23:42:09 +0000 (-0700) Subject: staging: comedi: quatech_daqp_cs: use comedi_pcmcia_disable() for (*detach) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=25736670bce6b860910ca789ab628bde46be71e6;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: quatech_daqp_cs: use comedi_pcmcia_disable() for (*detach) The (*detach) function, daqp_detach() is now a simple wrapper around comedi_pcmcia_disable(). Just use comedi_pcmcia_disable() directly for the (*detach). Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 869a4afc440e..6eab3bbb378b 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -790,16 +790,11 @@ static int daqp_auto_attach(struct comedi_device *dev, return 0; } -static void daqp_detach(struct comedi_device *dev) -{ - comedi_pcmcia_disable(dev); -} - static struct comedi_driver driver_daqp = { .driver_name = "quatech_daqp_cs", .module = THIS_MODULE, .auto_attach = daqp_auto_attach, - .detach = daqp_detach, + .detach = comedi_pcmcia_disable, }; static int daqp_cs_suspend(struct pcmcia_device *link)