diff options
| author | H Hartley Sweeten <[email protected]> | 2015-08-12 13:25:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-08-14 18:36:17 -0700 |
| commit | f821bf57a41f4aaab5c3306fd81e729208ca1404 (patch) | |
| tree | 6041802a41257f1b8d9fe0aa5931c6aa905b4f74 | |
| parent | 63316aae9102a3f7d0d94e32a43dad3b7b752cfe (diff) | |
staging: comedi: addi_apci_3501: rename CamelCase vars in apci3501_interrupt()
Rename the CamelCase local variables.
Signed-off-by: H Hartley Sweeten <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3501.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c index 17b17947c556..16684c01cfd6 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -262,25 +262,26 @@ static irqreturn_t apci3501_interrupt(int irq, void *d) { struct comedi_device *dev = d; struct apci3501_private *devpriv = dev->private; - unsigned int ui_Timer_AOWatchdog; - unsigned long ul_Command1; + unsigned int status; + unsigned int ctrl; /* Disable Interrupt */ - ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); - ul_Command1 = ul_Command1 & 0xFFFFF9FDul; - outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG); + ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); + ctrl &= 0xfffff9fd; + outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG); - ui_Timer_AOWatchdog = inl(dev->iobase + APCI3501_TIMER_IRQ_REG) & 0x1; - if ((!ui_Timer_AOWatchdog)) { + status = inl(dev->iobase + APCI3501_TIMER_IRQ_REG) & 0x1; + if (!status) { dev_err(dev->class_dev, "IRQ from unknown source\n"); return IRQ_NONE; } /* Enable Interrupt Send a signal to from kernel to user space */ send_sig(SIGIO, devpriv->tsk_Current, 0); - ul_Command1 = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); - ul_Command1 = (ul_Command1 & 0xFFFFF9FDul) | 1 << 1; - outl(ul_Command1, dev->iobase + APCI3501_TIMER_CTRL_REG); + ctrl = inl(dev->iobase + APCI3501_TIMER_CTRL_REG); + ctrl &= 0xfffff9fd; + ctrl |= 1 << 1; + outl(ctrl, dev->iobase + APCI3501_TIMER_CTRL_REG); inl(dev->iobase + APCI3501_TIMER_STATUS_REG); return IRQ_HANDLED; |