staging: comedi: addi_apci_3120: fix the number of subdevices

The addi-data "common" code always allocates 7 subdevices. This
driver is now separate from that code so we can remove the unused
subdevices.

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_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index dfe4ba173f881b85b8966db761b577fe9d6abeae..9ef9275c8775870bc485ca59f01c717c857e41dc 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -88,7 +88,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
        const struct addi_board *this_board;
        struct addi_private *devpriv;
        struct comedi_subdevice *s;
-       int ret, pages, i, n_subdevices;
+       int ret, pages, i;
 
        this_board = addi_find_boardinfo(dev, pcidev);
        if (!this_board)
@@ -151,8 +151,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
        if (devpriv->ul_DmaBufferVirtual[1])
                devpriv->b_DmaDoubleBuffer = 1;
 
-       n_subdevices = 7;
-       ret = comedi_alloc_subdevices(dev, n_subdevices);
+       ret = comedi_alloc_subdevices(dev, 5);
        if (ret)
                return ret;
 
@@ -239,14 +238,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
        s->insn_read = i_APCI3120_InsnReadTimer;
        s->insn_config = i_APCI3120_InsnConfigTimer;
 
-       /*  Allocate and Initialise TTL */
-       s = &dev->subdevices[5];
-       s->type = COMEDI_SUBD_UNUSED;
-
-       /* EEPROM */
-       s = &dev->subdevices[6];
-       s->type = COMEDI_SUBD_UNUSED;
-
        i_APCI3120_Reset(dev);
        return 0;
 }