Commit a6b5d2a2 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: addi_apci_035: remove unused subdevices

Only allocate space for the subdevicess used by the driver. Remove all
the COMEDI_SUBD_UNUSED subdevices.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d3e0bf0
...@@ -117,7 +117,7 @@ static int apci035_auto_attach(struct comedi_device *dev, ...@@ -117,7 +117,7 @@ static int apci035_auto_attach(struct comedi_device *dev,
addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0)); addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
} }
ret = comedi_alloc_subdevices(dev, 7); ret = comedi_alloc_subdevices(dev, 3);
if (ret) if (ret)
return ret; return ret;
...@@ -143,20 +143,8 @@ static int apci035_auto_attach(struct comedi_device *dev, ...@@ -143,20 +143,8 @@ static int apci035_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; 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];
s->type = COMEDI_SUBD_UNUSED;
/* Allocate and Initialise Timer Subdevice Structures */ /* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4]; s = &dev->subdevices[1];
if (devpriv->s_EeParameters.i_Timer) { if (devpriv->s_EeParameters.i_Timer) {
s->type = COMEDI_SUBD_TIMER; s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
...@@ -171,12 +159,8 @@ static int apci035_auto_attach(struct comedi_device *dev, ...@@ -171,12 +159,8 @@ static int apci035_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
/* Allocate and Initialise TTL */
s = &dev->subdevices[5];
s->type = COMEDI_SUBD_UNUSED;
/* EEPROM */ /* EEPROM */
s = &dev->subdevices[6]; s = &dev->subdevices[2];
if (this_board->i_PCIEeprom) { 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment