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

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

staging: comedi: comedi_pcmcia: introduce comedi_pcmcia_{enable, disable} 



Introduce some helper functions to enable/disable the PCMCIA device.
This will allow removing some of the boilerplate code in the comedi
PCMCIA drivers.

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 e44adfdb

drivers/staging/comedi/comedi_pcmcia.c

+46 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,52 @@ struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *dev) 
}

}

EXPORT_SYMBOL_GPL(comedi_to_pcmcia_dev);

EXPORT_SYMBOL_GPL(comedi_to_pcmcia_dev);





static int comedi_pcmcia_conf_check(struct pcmcia_device *link,

				    void *priv_data)

{

	if (link->config_index == 0)

		return -EINVAL;



	return pcmcia_request_io(link);

}



/**

 * comedi_pcmcia_enable() - Request the regions and enable the PCMCIA device.

 * @dev: comedi_device struct

 *

 * The comedi PCMCIA driver needs to set the link->config_flags, as

 * appropriate for that driver, before calling this function in order

 * to allow pcmcia_loop_config() to do its internal autoconfiguration.

 */

int comedi_pcmcia_enable(struct comedi_device *dev)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);

	int ret;



	if (!link)

		return -ENODEV;



	ret = pcmcia_loop_config(link, comedi_pcmcia_conf_check, NULL);

	if (ret)

		return ret;



	return pcmcia_enable_device(link);

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_enable);



/**

 * comedi_pcmcia_disable() - Disable the PCMCIA device and release the regions.

 * @dev: comedi_device struct

 */

void comedi_pcmcia_disable(struct comedi_device *dev)

{

	struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);



	if (link)

		pcmcia_disable_device(link);

}

EXPORT_SYMBOL_GPL(comedi_pcmcia_disable);



/**

/**

 * comedi_pcmcia_auto_config() - Configure/probe a comedi PCMCIA driver.

 * comedi_pcmcia_auto_config() - Configure/probe a comedi PCMCIA driver.

 * @link: pcmcia_device struct

 * @link: pcmcia_device struct

drivers/staging/comedi/comedidev.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,9 @@ struct pcmcia_device; 




struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *);

struct pcmcia_device *comedi_to_pcmcia_dev(struct comedi_device *);





int comedi_pcmcia_enable(struct comedi_device *);

void comedi_pcmcia_disable(struct comedi_device *);



int comedi_pcmcia_auto_config(struct pcmcia_device *, struct comedi_driver *);

int comedi_pcmcia_auto_config(struct pcmcia_device *, struct comedi_driver *);

void comedi_pcmcia_auto_unconfig(struct pcmcia_device *);

void comedi_pcmcia_auto_unconfig(struct pcmcia_device *);