openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: quatech_daqp_cs: use comedi_pcmcia_{enable, disable} 

Use the comedi_pcmcia_{enable,disable} helpers to enable/disable
the PCMCIA device.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-04 16:41:49 -07:00 committed by Greg Kroah-Hartman
parent c04edbf2f4
commit 87fe1452c6
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View File

@ -718,14 +718,6 @@ static int daqp_do_insn_write(struct comedi_device *dev,
return 1; return 1;
} }
static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
{
if (p_dev->config_index == 0)
return -EINVAL;
return pcmcia_request_io(p_dev);
}
static int daqp_auto_attach(struct comedi_device *dev, static int daqp_auto_attach(struct comedi_device *dev,
unsigned long context) unsigned long context)
{ {
@ -742,20 +734,16 @@ static int daqp_auto_attach(struct comedi_device *dev,
return -ENOMEM; return -ENOMEM;
link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;
ret = pcmcia_loop_config(link, daqp_pcmcia_config_loop, NULL); ret = comedi_pcmcia_enable(dev);
if (ret) if (ret)
return ret; return ret;
dev->iobase = link->resource[0]->start;
link->priv = local; link->priv = local;
ret = pcmcia_request_irq(link, daqp_interrupt); ret = pcmcia_request_irq(link, daqp_interrupt);
if (ret) if (ret)
return ret; return ret;
ret = pcmcia_enable_device(link);
if (ret)
return ret;
dev->iobase = link->resource[0]->start;
ret = comedi_alloc_subdevices(dev, 4); ret = comedi_alloc_subdevices(dev, 4);
if (ret) if (ret)
return ret; return ret;
@ -804,9 +792,7 @@ static int daqp_auto_attach(struct comedi_device *dev,
static void daqp_detach(struct comedi_device *dev) static void daqp_detach(struct comedi_device *dev)
{ {
struct pcmcia_device *link = comedi_to_pcmcia_dev(dev); comedi_pcmcia_disable(dev);
pcmcia_disable_device(link);
} }
static struct comedi_driver driver_daqp = { static struct comedi_driver driver_daqp = {