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

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

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



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

This driver does not use interrupts and is not an audio device,
remove CONF_ENABLE_IRQ and CONF_AUTO_AUDIO 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 95f932ce

drivers/staging/comedi/drivers/ni_daq_700.c

+3 −21
Original line number Diff line number Diff line
@@ -195,15 +195,6 @@ static void daq700_ai_config(struct comedi_device *dev, 
	inw(iobase + ADFIFO_R);		/* read 16bit junk from FIFO to clear */

}



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

			      unsigned long context)

{
@@ -213,14 +204,8 @@ static int daq700_auto_attach(struct comedi_device *dev, 


	dev->board_name = dev->driver->driver_name;



	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |

			      CONF_AUTO_SET_IO;



	ret = pcmcia_loop_config(link, daq700_pcmcia_config_loop, NULL);

	if (ret)

		return ret;



	ret = pcmcia_enable_device(link);

	link->config_flags |= CONF_AUTO_SET_IO;

	ret = comedi_pcmcia_enable(dev);

	if (ret)

		return ret;

	dev->iobase = link->resource[0]->start;
@@ -262,10 +247,7 @@ static int daq700_auto_attach(struct comedi_device *dev, 


static void daq700_detach(struct comedi_device *dev)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);



	if (dev->iobase)

		pcmcia_disable_device(link);

	comedi_pcmcia_disable(dev);

}



static struct comedi_driver daq700_driver = {