Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fe1452 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c04edbf2

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+3 −17
Original line number Diff line number Diff line
@@ -718,14 +718,6 @@ static int daqp_do_insn_write(struct comedi_device *dev, 
	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,

			    unsigned long context)

{
@@ -742,20 +734,16 @@ static int daqp_auto_attach(struct comedi_device *dev, 
		return -ENOMEM;



	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)

		return ret;

	dev->iobase = link->resource[0]->start;



	link->priv = local;

	ret = pcmcia_request_irq(link, daqp_interrupt);

	if (ret)

		return ret;



	ret = pcmcia_enable_device(link);

	if (ret)

		return ret;

	dev->iobase = link->resource[0]->start;



	ret = comedi_alloc_subdevices(dev, 4);

	if (ret)

		return ret;
@@ -804,9 +792,7 @@ static int daqp_auto_attach(struct comedi_device *dev, 


static void daqp_detach(struct comedi_device *dev)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);



	pcmcia_disable_device(link);

	comedi_pcmcia_disable(dev);

}



static struct comedi_driver driver_daqp = {