staging: comedi: addi_apci_1032: remove unnecessary eeprom code

Now that this driver is separate from the "common" addi-data code,
the eeprom does not contain any information required to make this
driver work.

Remove the unneeded initalization of the 's_EeParameters' and the
code that reads the eeprom to fill in the parameters.

Also, since reading the eeprom is not really interesting, remove
the EEPROM subdevice.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index ab9453d828a2f28fd912021cf559b8dc238e4985..159e70d1e84f34efa0a56d51745bb6c055ff45e2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -4,7 +4,6 @@
 
 #include "addi-data/addi_common.h"
 
-#include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci1032.c"
 
 static const struct addi_board apci1032_boardtypes[] = {
@@ -19,23 +18,6 @@ static const struct addi_board apci1032_boardtypes[] = {
        },
 };
 
-static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
-                                    struct comedi_subdevice *s,
-                                    struct comedi_insn *insn,
-                                    unsigned int *data)
-{
-       const struct addi_board *this_board = comedi_board(dev);
-       struct addi_private *devpriv = dev->private;
-       unsigned short w_Address = CR_CHAN(insn->chanspec);
-       unsigned short w_Data;
-
-       w_Data = addi_eeprom_readw(devpriv->i_IobaseAmcc,
-               this_board->pc_EepromChip, 2 * w_Address);
-       data[0] = w_Data;
-
-       return insn->n;
-}
-
 static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
@@ -69,7 +51,6 @@ static int apci1032_attach_pci(struct comedi_device *dev,
        struct addi_private *devpriv;
        struct comedi_subdevice *s;
        int ret, n_subdevices;
-       unsigned int dw_Dummy;
 
        this_board = addi_find_boardinfo(dev, pcidev);
        if (!this_board)
@@ -88,23 +69,6 @@ static int apci1032_attach_pci(struct comedi_device *dev,
 
        dev->iobase = pci_resource_start(pcidev, 2);
 
-       /* Initialize parameters that can be overridden in EEPROM */
-       devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel;
-       devpriv->s_EeParameters.i_NbrAoChannel = this_board->i_NbrAoChannel;
-       devpriv->s_EeParameters.i_AiMaxdata = this_board->i_AiMaxdata;
-       devpriv->s_EeParameters.i_AoMaxdata = this_board->i_AoMaxdata;
-       devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
-       devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
-       devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;
-       devpriv->s_EeParameters.i_Dma = this_board->i_Dma;
-       devpriv->s_EeParameters.i_Timer = this_board->i_Timer;
-       devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
-               this_board->ui_MinAcquisitiontimeNs;
-       devpriv->s_EeParameters.ui_MinDelaytimeNs =
-               this_board->ui_MinDelaytimeNs;
-
-       /* ## */
-
        if (pcidev->irq > 0) {
                ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
                                  dev->board_name, dev);
@@ -112,23 +76,6 @@ static int apci1032_attach_pci(struct comedi_device *dev,
                        dev->irq = pcidev->irq;
        }
 
-       /*  Read eepeom and fill addi_board Structure */
-
-       if (this_board->i_PCIEeprom) {
-               if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
-                       /*  Set 3 wait stait */
-                       if (!(strcmp(dev->board_name, "apci035"))) {
-                               outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
-                       } else {
-                               outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
-                       }
-                       /*  Enable the interrupt for the controller */
-                       dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
-                       outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
-               }
-               addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
-       }
-
        n_subdevices = 7;
        ret = comedi_alloc_subdevices(dev, n_subdevices);
        if (ret)
@@ -168,15 +115,7 @@ static int apci1032_attach_pci(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_UNUSED;
 
        i_APCI1032_Reset(dev);
        return 0;