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

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

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



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

This driver does not use interrupts so remove CONF_ENABLE_IRQ from
the link->config_flags.

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 7fadd565

drivers/staging/comedi/drivers/das08_cs.c

+3 −23
Original line number Diff line number Diff line
@@ -69,15 +69,6 @@ static const struct das08_board_struct das08_cs_boards[] = { 
	},

};



static int das08_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 das08_cs_auto_attach(struct comedi_device *dev,

				unsigned long context)

{
@@ -89,16 +80,8 @@ static int das08_cs_auto_attach(struct comedi_device *dev, 
	/* The das08 driver needs the board_ptr */

	dev->board_ptr = &das08_cs_boards[0];



	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;



	ret = pcmcia_loop_config(link, das08_pcmcia_config_loop, NULL);

	if (ret)

		return ret;



	if (!link->irq)

		return -EINVAL;



	ret = pcmcia_enable_device(link);

	link->config_flags |= CONF_AUTO_SET_IO;

	ret = comedi_pcmcia_enable(dev);

	if (ret)

		return ret;

	iobase = link->resource[0]->start;
@@ -113,11 +96,8 @@ static int das08_cs_auto_attach(struct comedi_device *dev, 


static void das08_cs_detach(struct comedi_device *dev)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);



	das08_common_detach(dev);

	if (dev->iobase)

		pcmcia_disable_device(link);

	comedi_pcmcia_disable(dev);

}



static struct comedi_driver driver_das08_cs = {