diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-11 22:49:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 23:03:16 +0200 |
| commit | 12b4a097b6fd6d7c7e18dbb40d2ed62cdc26cd3b (patch) | |
| tree | 3fa8afda747acaaf9f07597f0d170e782b0943dd /drivers | |
| parent | staging: comedi: icp_multi: remove have_irq from boardinfo (diff) | |
| download | linux-12b4a097b6fd6d7c7e18dbb40d2ed62cdc26cd3b.tar.xz linux-12b4a097b6fd6d7c7e18dbb40d2ed62cdc26cd3b.zip | |
staging: comedi: icp_multi: the number of subdevices is fixed
This board always has 5 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 36336c1a3cfa..4d2952ec2a13 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -700,7 +700,7 @@ static int icp_multi_attach(struct comedi_device *dev, struct comedi_devconfig *it) { struct comedi_subdevice *s; - int ret, subdev, n_subdevices; + int ret; unsigned int irq; struct pcilst_struct *card = NULL; resource_size_t io_addr[5], iobase; @@ -753,14 +753,7 @@ static int icp_multi_attach(struct comedi_device *dev, dev->board_name = this_board->name; - n_subdevices = 0; - n_subdevices++; - n_subdevices++; - n_subdevices++; - n_subdevices++; - n_subdevices++; - - ret = comedi_alloc_subdevices(dev, n_subdevices); + ret = comedi_alloc_subdevices(dev, 5); if (ret) return ret; @@ -782,9 +775,7 @@ static int icp_multi_attach(struct comedi_device *dev, printk(KERN_WARNING ".\n"); - subdev = 0; - - s = &dev->subdevices[subdev]; + s = &dev->subdevices[0]; dev->read_subdev = s; s->type = COMEDI_SUBD_AI; s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; @@ -793,9 +784,8 @@ static int icp_multi_attach(struct comedi_device *dev, s->len_chanlist = 16; s->range_table = &range_analog; s->insn_read = icp_multi_insn_read_ai; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[1]; s->type = COMEDI_SUBD_AO; s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 4; @@ -804,9 +794,8 @@ static int icp_multi_attach(struct comedi_device *dev, s->range_table = &range_analog; s->insn_write = icp_multi_insn_write_ao; s->insn_read = icp_multi_insn_read_ao; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[2]; s->type = COMEDI_SUBD_DI; s->subdev_flags = SDF_READABLE; s->n_chan = 16; @@ -815,9 +804,8 @@ static int icp_multi_attach(struct comedi_device *dev, s->range_table = &range_digital; s->io_bits = 0; s->insn_bits = icp_multi_insn_bits_di; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[3]; s->type = COMEDI_SUBD_DO; s->subdev_flags = SDF_WRITABLE | SDF_READABLE; s->n_chan = 8; @@ -827,9 +815,8 @@ static int icp_multi_attach(struct comedi_device *dev, s->io_bits = 0xff; s->state = 0; s->insn_bits = icp_multi_insn_bits_do; - subdev++; - s = &dev->subdevices[subdev]; + s = &dev->subdevices[4]; s->type = COMEDI_SUBD_COUNTER; s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; s->n_chan = 4; @@ -838,7 +825,6 @@ static int icp_multi_attach(struct comedi_device *dev, s->state = 0; s->insn_read = icp_multi_insn_read_ctr; s->insn_write = icp_multi_insn_write_ctr; - subdev++; devpriv->valid = 1; |