hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2012-11-01 17:28:41 -07:00 committed by Greg Kroah-Hartman
parent f538c37ded
commit aea9c4e284
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@ -88,7 +88,7 @@ static int apci3120_attach_pci(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, pages, i, n_subdevices; int ret, pages, i;
this_board = addi_find_boardinfo(dev, pcidev); this_board = addi_find_boardinfo(dev, pcidev);
if (!this_board) if (!this_board)
@ -151,8 +151,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
if (devpriv->ul_DmaBufferVirtual[1]) if (devpriv->ul_DmaBufferVirtual[1])
devpriv->b_DmaDoubleBuffer = 1; devpriv->b_DmaDoubleBuffer = 1;
n_subdevices = 7; ret = comedi_alloc_subdevices(dev, 5);
ret = comedi_alloc_subdevices(dev, n_subdevices);
if (ret) if (ret)
return ret; return ret;
@ -239,14 +238,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s->insn_read = i_APCI3120_InsnReadTimer; s->insn_read = i_APCI3120_InsnReadTimer;
s->insn_config = i_APCI3120_InsnConfigTimer; 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); i_APCI3120_Reset(dev);
return 0; return 0;
} }