staging: comedi: addi_apci_2032: only allocate needed subdevices

The addi-data "common" code always allocated 7 subdevices. This driver
only requires 2. Change the allocation and 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_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 9b0c402bed0faf0367aef3b479c83ebbc6abf3a2..84e6b4fa52d7c88d1832ec6eb07b8030af2ad3af 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -70,7 +70,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
        const struct addi_board *this_board;
        struct addi_private *devpriv;
        struct comedi_subdevice *s;
-       int ret, n_subdevices;
+       int ret;
 
        this_board = addi_find_boardinfo(dev, pcidev);
        if (!this_board)
@@ -95,25 +95,12 @@ static int apci2032_auto_attach(struct comedi_device *dev,
                        dev->irq = pcidev->irq;
        }
 
-       n_subdevices = 7;
-       ret = comedi_alloc_subdevices(dev, n_subdevices);
+       ret = comedi_alloc_subdevices(dev, 2);
        if (ret)
                return ret;
 
-       /*  Allocate and Initialise AI Subdevice Structures */
+       /* Initialize the digital output subdevice */
        s = &dev->subdevices[0];
-       s->type = COMEDI_SUBD_UNUSED;
-
-       /*  Allocate and Initialise AO Subdevice Structures */
-       s = &dev->subdevices[1];
-       s->type = COMEDI_SUBD_UNUSED;
-
-       /*  Allocate and Initialise DI Subdevice Structures */
-       s = &dev->subdevices[2];
-       s->type = COMEDI_SUBD_UNUSED;
-
-       /*  Allocate and Initialise DO Subdevice Structures */
-       s = &dev->subdevices[3];
        if (this_board->i_NbrDoChannel) {
                s->type = COMEDI_SUBD_DO;
                s->subdev_flags =
@@ -133,8 +120,8 @@ static int apci2032_auto_attach(struct comedi_device *dev,
                s->type = COMEDI_SUBD_UNUSED;
        }
 
-       /*  Allocate and Initialise Timer Subdevice Structures */
-       s = &dev->subdevices[4];
+       /* Initialize the watchdog subdevice */
+       s = &dev->subdevices[1];
        if (this_board->i_Timer) {
                s->type = COMEDI_SUBD_TIMER;
                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
@@ -151,14 +138,6 @@ static int apci2032_auto_attach(struct comedi_device *dev,
                s->type = COMEDI_SUBD_UNUSED;
        }
 
-       /*  Allocate and Initialise TTL */
-       s = &dev->subdevices[5];
-       s->type = COMEDI_SUBD_UNUSED;
-
-       /* EEPROM */
-       s = &dev->subdevices[6];
-       s->type = COMEDI_SUBD_UNUSED;
-
        apci2032_reset(dev);
        return 0;
 }