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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 2302e5acbfc14179964a4eed90e95a0148c1ba6b..48f7c82b2a9cf681509e07930f42ef3c7e409801 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -50,7 +50,7 @@ static int apci3501_do_insn_bits(struct comedi_device *dev,
        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_insn *insn,
                                     unsigned int *data)
@@ -256,15 +256,11 @@ static int apci3501_auto_attach(struct comedi_device *dev,
 
        /* EEPROM */
        s = &dev->subdevices[6];
-       if (this_board->i_PCIEeprom) {
-               s->type = COMEDI_SUBD_MEMORY;
-               s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
-               s->n_chan = 256;
-               s->maxdata = 0xffff;
-               s->insn_read = i_ADDIDATA_InsnReadEeprom;
-       } else {
-               s->type = COMEDI_SUBD_UNUSED;
-       }
+       s->type         = COMEDI_SUBD_MEMORY;
+       s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
+       s->n_chan       = 256;
+       s->maxdata      = 0xffff;
+       s->insn_read    = apci3501_eeprom_insn_read;
 
        apci3501_reset(dev);
        return 0;