diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-10-24 10:26:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:06:01 +0800 |
| commit | 367ff14edd97bbd0d54e5bdfeb10201cbe491d0b (patch) | |
| tree | f04d88f92168d8b6c6ed2c308c0848e8c0276f0e | |
| parent | b3ba2be24cf197cadf3614ee5203ee42ac1109a6 (diff) | |
staging: comedi: addi_apci_1564: board has 3 timers
According to ADDI-DATA, the APCI-1564 only has 3 timers. There are some
customer specific boards with 4 timers but they use out of tree drivers.
Now that the timer 'channels' are handled correctly in the subdevice
functions, fix the number of timer channels for the subdevice and remove
the code that would access a 4th timer.
Also, remove the unnecessary initialzation of the subdevice 'len_chanlist'.
That member is only used by subdevices that support async commands.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_1564.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index 5282f468f36f..45f977236162 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -98,8 +98,6 @@ static int apci1564_timer_config(struct comedi_device *dev, APCI1564_COUNTER_IRQ_REG(1)); outl(0x0, dev->iobase + APCI1564_COUNTER_IRQ_REG(2)); - outl(0x0, dev->iobase + - APCI1564_COUNTER_IRQ_REG(3)); } else { /* disable Timer interrupt */ outl(0x0, devpriv->amcc_iobase + APCI1564_TIMER_CTRL_REG); diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index 61a7b27b37a1..b95da410a8e3 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1564.c +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c @@ -68,7 +68,6 @@ static int apci1564_reset(struct comedi_device *dev) outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(0)); outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(1)); outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(2)); - outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(3)); return 0; } @@ -434,9 +433,8 @@ static int apci1564_auto_attach(struct comedi_device *dev, s = &dev->subdevices[3]; s->type = COMEDI_SUBD_TIMER; s->subdev_flags = SDF_WRITEABLE; - s->n_chan = 1; + s->n_chan = 3; s->maxdata = 0; - s->len_chanlist = 1; s->range_table = &range_digital; s->insn_write = apci1564_timer_write; s->insn_read = apci1564_timer_read; |