[PATCH 3/3] staging: comedi: addi_apci_1564: clean up apci1564_interrupt()
The code in apci1564_interrupt() for handling counter interrupts is currently
repeated four times; once for each counter. This code is identical save for the
registers it is using, so just handle all four counters with a for loop.
Also, the interrupt function was doing a useless set-and-check of
devpriv->timer_select_mode before processing any triggered interrupts, remove
all occurrences of this.
Signed-off-by: Chase Southwood
Cc: Ian Abbott
Cc: H Hartley Sweeten
---
Hartley,
I remember that you mentioned that the counters could be handled using a for
loop here. Is there a better way to go about that or am I on the right track
with this?
Thanks,
Chase
drivers/staging/comedi/drivers/addi_apci_1564.c | 108 +---
1 file changed, 23 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c
b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 0141ed9..f40910e 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -60,8 +60,9 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
struct comedi_subdevice *s = dev->read_subdev;
unsigned int ui_DO, ui_DI;
unsigned int ui_Timer;
- unsigned int ui_C1, ui_C2, ui_C3, ui_C4;
+ unsigned int counters[4];
unsigned int ul_Command2 = 0;
+ int i;
/* check interrupt is from this device */
if ((inl(devpriv->amcc_iobase + AMCC_OP_REG_INTCSR) &
@@ -73,16 +74,17 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
APCI1564_DI_INT_ENABLE;
ui_DO = inl(devpriv->amcc_iobase + APCI1564_DO_IRQ_REG) & 0x01;
ui_Timer = inl(devpriv->amcc_iobase + APCI1564_TIMER_IRQ_REG) & 0x01;
- ui_C1 =
+ counters[0] =
inl(dev->iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER1)) &
0x1;
- ui_C2 =
+ counters[1] =
inl(dev->iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER2)) &
0x1;
- ui_C3 =
+ counters[2] =
inl(dev->iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER3)) &
0x1;
- ui_C4 =
+ counters[3] =
inl(dev->iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER4)) &
0x1;
- if (ui_DI == 0 && ui_DO == 0 && ui_Timer == 0 && ui_C1 == 0
- && ui_C2 == 0 && ui_C3 == 0 && ui_C4 == 0) {
+ if (ui_DI == 0 && ui_DO == 0 && ui_Timer == 0 && counters[0] == 0
+ && counters[1] == 0 && counters[2] == 0 && counters[3] == 0) {
+ dev_err(dev->class_dev, "Interrupt from unknown source.\n");
return IRQ_HANDLED;
}
@@ -113,95 +115,31 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
}
if (ui_Timer == 1) {
- devpriv->timer_select_mode = ADDIDATA_TIMER;
- if (devpriv->timer_select_mode) {
+ /* Disable Timer Interrupt */
+ ul_Command2 = inl(devpriv->amcc_iobase +
APCI1564_TIMER_CTRL_REG);
+ outl(0x0, devpriv->amcc_iobase + APCI1564_TIMER_CTRL_REG);
- /* Disable Timer Interrupt */
- ul_Command2 = inl(devpriv->amcc_iobase +
APCI1564_TIMER_CTRL_REG);
- outl(0x0, devpriv->amcc_iobase +
APCI1564_TIMER_CTRL_REG);
-
- /* Send a signal to from kernel to user space */
- send_sig(SIGIO, devpriv->tsk_current, 0);
-
- /* Enable Timer Interrupt */
-
- outl(ul_Command2, devpriv->amcc_iobase +
APCI1564_TIMER_CTRL_REG);
- }
- }
-
- if (ui_C1 == 1) {
- devpriv->timer_select_mode = ADDIDATA_COUNTER;
- if (devpriv->timer_select_mode) {
-
- /* Disable Counter Interrupt */
- ul_Command2 =
- inl(dev->iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
- outl(0x0,
-dev->iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
-
- /* Send a signal to from kernel to user space */
- send_sig(SIGIO, devpriv->tsk_current, 0);
-
- /* Enable Counter Interrupt */
- outl(ul_Command2,
-dev->iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
- }
- }
-
- if (ui_C2 == 1) {
- devpriv->timer_select_mode = ADDIDATA_COUNTER;
- if (devpriv->timer_select_mode) {
-
- /* Disable Counter Interrupt */
- ul_Command2 =
- inl(dev->iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER2));
- outl(0x0,
-dev->iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER2));
-
- /* Send a signal to from kernel to user space */
-
[PATCH 3/3] staging: comedi: addi_apci_1564: clean up apci1564_interrupt()
The code in apci1564_interrupt() for handling counter interrupts is currently
repeated four times; once for each counter. This code is identical save for the
registers it is using, so just handle all four counters with a for loop.
Also, the interrupt function was doing a useless set-and-check of
devpriv-timer_select_mode before processing any triggered interrupts, remove
all occurrences of this.
Signed-off-by: Chase Southwood chase.southw...@gmail.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: H Hartley Sweeten hswee...@visionengravers.com
---
Hartley,
I remember that you mentioned that the counters could be handled using a for
loop here. Is there a better way to go about that or am I on the right track
with this?
Thanks,
Chase
drivers/staging/comedi/drivers/addi_apci_1564.c | 108 +---
1 file changed, 23 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c
b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 0141ed9..f40910e 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -60,8 +60,9 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
struct comedi_subdevice *s = dev-read_subdev;
unsigned int ui_DO, ui_DI;
unsigned int ui_Timer;
- unsigned int ui_C1, ui_C2, ui_C3, ui_C4;
+ unsigned int counters[4];
unsigned int ul_Command2 = 0;
+ int i;
/* check interrupt is from this device */
if ((inl(devpriv-amcc_iobase + AMCC_OP_REG_INTCSR)
@@ -73,16 +74,17 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
APCI1564_DI_INT_ENABLE;
ui_DO = inl(devpriv-amcc_iobase + APCI1564_DO_IRQ_REG) 0x01;
ui_Timer = inl(devpriv-amcc_iobase + APCI1564_TIMER_IRQ_REG) 0x01;
- ui_C1 =
+ counters[0] =
inl(dev-iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER1))
0x1;
- ui_C2 =
+ counters[1] =
inl(dev-iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER2))
0x1;
- ui_C3 =
+ counters[2] =
inl(dev-iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER3))
0x1;
- ui_C4 =
+ counters[3] =
inl(dev-iobase + APCI1564_TCW_IRQ_REG(APCI1564_COUNTER4))
0x1;
- if (ui_DI == 0 ui_DO == 0 ui_Timer == 0 ui_C1 == 0
-ui_C2 == 0 ui_C3 == 0 ui_C4 == 0) {
+ if (ui_DI == 0 ui_DO == 0 ui_Timer == 0 counters[0] == 0
+counters[1] == 0 counters[2] == 0 counters[3] == 0) {
+ dev_err(dev-class_dev, Interrupt from unknown source.\n);
return IRQ_HANDLED;
}
@@ -113,95 +115,31 @@ static irqreturn_t apci1564_interrupt(int irq, void *d)
}
if (ui_Timer == 1) {
- devpriv-timer_select_mode = ADDIDATA_TIMER;
- if (devpriv-timer_select_mode) {
+ /* Disable Timer Interrupt */
+ ul_Command2 = inl(devpriv-amcc_iobase +
APCI1564_TIMER_CTRL_REG);
+ outl(0x0, devpriv-amcc_iobase + APCI1564_TIMER_CTRL_REG);
- /* Disable Timer Interrupt */
- ul_Command2 = inl(devpriv-amcc_iobase +
APCI1564_TIMER_CTRL_REG);
- outl(0x0, devpriv-amcc_iobase +
APCI1564_TIMER_CTRL_REG);
-
- /* Send a signal to from kernel to user space */
- send_sig(SIGIO, devpriv-tsk_current, 0);
-
- /* Enable Timer Interrupt */
-
- outl(ul_Command2, devpriv-amcc_iobase +
APCI1564_TIMER_CTRL_REG);
- }
- }
-
- if (ui_C1 == 1) {
- devpriv-timer_select_mode = ADDIDATA_COUNTER;
- if (devpriv-timer_select_mode) {
-
- /* Disable Counter Interrupt */
- ul_Command2 =
- inl(dev-iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
- outl(0x0,
-dev-iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
-
- /* Send a signal to from kernel to user space */
- send_sig(SIGIO, devpriv-tsk_current, 0);
-
- /* Enable Counter Interrupt */
- outl(ul_Command2,
-dev-iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER1));
- }
- }
-
- if (ui_C2 == 1) {
- devpriv-timer_select_mode = ADDIDATA_COUNTER;
- if (devpriv-timer_select_mode) {
-
- /* Disable Counter Interrupt */
- ul_Command2 =
- inl(dev-iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER2));
- outl(0x0,
-dev-iobase +
APCI1564_TCW_CTRL_REG(APCI1564_COUNTER2));
-
- /* Send a signal to from kernel to user space */
-
