hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: comedi_pcmcia: allow drivers to use a custom conf_check() 

Allow comedi pcmcia drivers to use a custom conf_check() when calling
comedi_pcmcia_enable() to enable the pcmcia device. If a conf_check()
is not passed the internal comedi_pcmcia_conf_check() will be used.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-05 18:16:07 -07:00 committed by Greg Kroah-Hartman
parent 4f60f6b69c
commit a3ac95195b
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/comedi_pcmcia.c
View File

@ -49,12 +49,14 @@ static int comedi_pcmcia_conf_check(struct pcmcia_device *link,
/** /**
* comedi_pcmcia_enable() - Request the regions and enable the PCMCIA device. * comedi_pcmcia_enable() - Request the regions and enable the PCMCIA device.
* @dev: comedi_device struct * @dev: comedi_device struct
* @conf_check: optional callback to check the pcmcia_device configuration
* *
* The comedi PCMCIA driver needs to set the link->config_flags, as * The comedi PCMCIA driver needs to set the link->config_flags, as
* appropriate for that driver, before calling this function in order * appropriate for that driver, before calling this function in order
* to allow pcmcia_loop_config() to do its internal autoconfiguration. * to allow pcmcia_loop_config() to do its internal autoconfiguration.
*/ */
int comedi_pcmcia_enable(struct comedi_device *dev) int comedi_pcmcia_enable(struct comedi_device *dev,
int (*conf_check)(struct pcmcia_device *, void *))
{ {
struct pcmcia_device *link = comedi_to_pcmcia_dev(dev); struct pcmcia_device *link = comedi_to_pcmcia_dev(dev);
int ret; int ret;
@ -62,7 +64,10 @@ int comedi_pcmcia_enable(struct comedi_device *dev)
if (!link) if (!link)
return -ENODEV; return -ENODEV;
ret = pcmcia_loop_config(link, comedi_pcmcia_conf_check, NULL); if (!conf_check)
conf_check = comedi_pcmcia_conf_check;
ret = pcmcia_loop_config(link, conf_check, NULL);
if (ret) if (ret)
return ret; return ret;

3
drivers/staging/comedi/comedidev.h
View File

@ -440,7 +440,8 @@ 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 *); int comedi_pcmcia_enable(struct comedi_device *,
int (*conf_check)(struct pcmcia_device *, void *));
void comedi_pcmcia_disable(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 *);

2
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@ -413,7 +413,7 @@ static int das16cs_auto_attach(struct comedi_device *dev,
dev->board_name = board->name; dev->board_name = board->name;
link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; link->config_flags |= CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;
ret = comedi_pcmcia_enable(dev); ret = comedi_pcmcia_enable(dev, NULL);
if (ret) if (ret)
return ret; return ret;
dev->iobase = link->resource[0]->start; dev->iobase = link->resource[0]->start;

2
drivers/staging/comedi/drivers/das08_cs.c
View File

@ -81,7 +81,7 @@ static int das08_cs_auto_attach(struct comedi_device *dev,
dev->board_ptr = &das08_cs_boards[0]; dev->board_ptr = &das08_cs_boards[0];
link->config_flags |= CONF_AUTO_SET_IO; link->config_flags |= CONF_AUTO_SET_IO;
ret = comedi_pcmcia_enable(dev); ret = comedi_pcmcia_enable(dev, NULL);
if (ret) if (ret)
return ret; return ret;
iobase = link->resource[0]->start; iobase = link->resource[0]->start;

2
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@ -205,7 +205,7 @@ static int daq700_auto_attach(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name; dev->board_name = dev->driver->driver_name;
link->config_flags |= CONF_AUTO_SET_IO; link->config_flags |= CONF_AUTO_SET_IO;
ret = comedi_pcmcia_enable(dev); ret = comedi_pcmcia_enable(dev, NULL);
if (ret) if (ret)
return ret; return ret;
dev->iobase = link->resource[0]->start; dev->iobase = link->resource[0]->start;

2
drivers/staging/comedi/drivers/ni_daq_dio24.c
View File

@ -55,7 +55,7 @@ static int dio24_auto_attach(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name; dev->board_name = dev->driver->driver_name;
link->config_flags |= CONF_AUTO_SET_IO; link->config_flags |= CONF_AUTO_SET_IO;
ret = comedi_pcmcia_enable(dev); ret = comedi_pcmcia_enable(dev, NULL);
return ret; return ret;
dev->iobase = link->resource[0]->start; dev->iobase = link->resource[0]->start;

2
drivers/staging/comedi/drivers/ni_labpc_cs.c
View File

@ -99,7 +99,7 @@ static int labpc_auto_attach(struct comedi_device *dev,
link->config_flags |= CONF_AUTO_SET_IO | link->config_flags |= CONF_AUTO_SET_IO |
CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
ret = comedi_pcmcia_enable(dev); ret = comedi_pcmcia_enable(dev, NULL);
if (ret) if (ret)
return ret; return ret;
dev->iobase = link->resource[0]->start; dev->iobase = link->resource[0]->start;