Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 367ff14e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: 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 b3ba2be2

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/addi_apci_1564.c

+1 −3
Original line number Diff line number Diff line
@@ -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;