UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: addi_apci_3501: board has an eeprom 

The board supported by this driver has an on-board eeprom. Since
we need to read it to get the number of analog output channels,
expose the eeprom as a readable subdevice to the user.

Rename the i_ADDIDATA_InsnReadEeprom() function to give it namespace
associated with the driver.

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-01-23 12:41:36 -07:00 committed by Greg Kroah-Hartman
parent 9f89ce8c62
commit 87c38fbed5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/addi_apci_3501.c
View File

@ -50,7 +50,7 @@ static int apci3501_do_insn_bits(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, static int apci3501_eeprom_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
@ -256,15 +256,11 @@ static int apci3501_auto_attach(struct comedi_device *dev,
/* EEPROM */ /* EEPROM */
s = &dev->subdevices[6]; s = &dev->subdevices[6];
if (this_board->i_PCIEeprom) { s->type = COMEDI_SUBD_MEMORY;
s->type = COMEDI_SUBD_MEMORY; s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
s->subdev_flags = SDF_READABLE | SDF_INTERNAL; s->n_chan = 256;
s->n_chan = 256; s->maxdata = 0xffff;
s->maxdata = 0xffff; s->insn_read = apci3501_eeprom_insn_read;
s->insn_read = i_ADDIDATA_InsnReadEeprom;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
apci3501_reset(dev); apci3501_reset(dev);
return 0; return 0;