Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: addi_apci_2032: only allocate needed subdevices

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2012-11-29 18:18:03 -07:00 • committed by Greg Kroah-Hartman
parent 490555966e
commit 0c33bdd01a
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/comedi/drivers/addi_apci_2032.c
View file

@ -70,7 +70,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
const struct addi_board *this_board; const struct addi_board *this_board;
struct addi_private *devpriv; struct addi_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ret, n_subdevices; int ret;
this_board = addi_find_boardinfo(dev, pcidev); this_board = addi_find_boardinfo(dev, pcidev);
if (!this_board) if (!this_board)
@ -95,25 +95,12 @@ static int apci2032_auto_attach(struct comedi_device *dev,
dev->irq = pcidev->irq; dev->irq = pcidev->irq;
} }
n_subdevices = 7; ret = comedi_alloc_subdevices(dev, 2);
ret = comedi_alloc_subdevices(dev, n_subdevices);
if (ret) if (ret)
return ret; return ret;
/* Allocate and Initialise AI Subdevice Structures */ /* Initialize the digital output subdevice */
s = &dev->subdevices[0]; 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) { if (this_board->i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
s->subdev_flags = s->subdev_flags =
@ -133,8 +120,8 @@ static int apci2032_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
} }
/* Allocate and Initialise Timer Subdevice Structures */ /* Initialize the watchdog subdevice */
s = &dev->subdevices[4]; s = &dev->subdevices[1];
if (this_board->i_Timer) { if (this_board->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;
@ -151,14 +138,6 @@ static int apci2032_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 */
s = &dev->subdevices[6];
s->type = COMEDI_SUBD_UNUSED;
apci2032_reset(dev); apci2032_reset(dev);
return 0; return 0;
} }