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

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

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



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

This driver is not an audio device, remove 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 573a9648

drivers/staging/comedi/drivers/ni_labpc_cs.c

+5 −22
Original line number Original line Diff line number Diff line
@@ -87,15 +87,6 @@ static const struct labpc_board_struct labpc_cs_boards[] = { 
	},

	},

};

};





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

static int labpc_auto_attach(struct comedi_device *dev,

			     unsigned long context)

			     unsigned long context)

{

{
@@ -106,21 +97,16 @@ static int labpc_auto_attach(struct comedi_device *dev, 
	/* The ni_labpc driver needs the board_ptr */

	/* The ni_labpc driver needs the board_ptr */

	dev->board_ptr = &labpc_cs_boards[0];

	dev->board_ptr = &labpc_cs_boards[0];





	link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ |

	link->config_flags |= CONF_AUTO_SET_IO |

			      CONF_AUTO_AUDIO | CONF_AUTO_SET_IO;

			      CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;



	ret = comedi_pcmcia_enable(dev);

	ret = pcmcia_loop_config(link, labpc_pcmcia_config_loop, NULL);

	if (ret)

	if (ret)

		return ret;

		return ret;

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





	if (!link->irq)

	if (!link->irq)

		return -EINVAL;

		return -EINVAL;





	ret = pcmcia_enable_device(link);

	if (ret)

		return ret;

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



	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);

	if (!devpriv)

	if (!devpriv)

		return -ENOMEM;

		return -ENOMEM;
@@ -131,11 +117,8 @@ static int labpc_auto_attach(struct comedi_device *dev, 




static void labpc_detach(struct comedi_device *dev)

static void labpc_detach(struct comedi_device *dev)

{

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);



	labpc_common_detach(dev);

	labpc_common_detach(dev);

	if (dev->iobase)

	comedi_pcmcia_disable(dev);

		pcmcia_disable_device(link);

}

}





static struct comedi_driver driver_labpc_cs = {

static struct comedi_driver driver_labpc_cs = {