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

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

staging: comedi: addi_apci_1564: remove APCI1564_COUNTER[1234] defines 



These defines don't add any significant clarity to the driver. Remove them.

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 ac584af5

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

+4 −8
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
#define ADDIDATA_TIMER					0

#define ADDIDATA_COUNTER				1

#define ADDIDATA_WATCHDOG				2

#define APCI1564_COUNTER1				0

#define APCI1564_COUNTER2				1

#define APCI1564_COUNTER3				2

#define APCI1564_COUNTER4				3



/*

 * devpriv->amcc_iobase Register Map
@@ -97,13 +93,13 @@ static int apci1564_timer_config(struct comedi_device *dev, 
			outl(0x0, devpriv->amcc_iobase + APCI1564_DO_IRQ_REG);

			outl(0x0, devpriv->amcc_iobase + APCI1564_WDOG_IRQ_REG);

			outl(0x0, dev->iobase +

			    APCI1564_COUNTER_IRQ_REG(APCI1564_COUNTER1));

			    APCI1564_COUNTER_IRQ_REG(0));

			outl(0x0, dev->iobase +

			    APCI1564_COUNTER_IRQ_REG(APCI1564_COUNTER2));

			    APCI1564_COUNTER_IRQ_REG(1));

			outl(0x0, dev->iobase +

			    APCI1564_COUNTER_IRQ_REG(APCI1564_COUNTER3));

			    APCI1564_COUNTER_IRQ_REG(2));

			outl(0x0, dev->iobase +

			    APCI1564_COUNTER_IRQ_REG(APCI1564_COUNTER4));

			    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

+4 −4
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ static int apci1564_reset(struct comedi_device *dev) 
	outl(0x0, devpriv->amcc_iobase + APCI1564_TIMER_RELOAD_REG);



	/* Reset the counter registers */

	outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(APCI1564_COUNTER1));

	outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(APCI1564_COUNTER2));

	outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(APCI1564_COUNTER3));

	outl(0x0, dev->iobase + APCI1564_COUNTER_CTRL_REG(APCI1564_COUNTER4));

	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;

}