evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: comedi: addi-data: cleanup conditional blocks in hwdrv_apci035.c

Browse source 
There were some conditional blocks that had an unnecessary level of
indentation in them.  We can remove this to improve code clarity.

Signed-off-by: Chase Southwood <chase.southwood@yahoo.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chase Southwood 2014-02-24 10:34:13 -06:00 • committed by Greg Kroah-Hartman
parent 85b3842bd2
commit 711b888ea6
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View file

@ -207,23 +207,22 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
ui_Command = ui_Command =
(ui_Command & 0xFFF719E2UL) | ui_Mode << 13UL | 0x10UL; (ui_Command & 0xFFF719E2UL) | ui_Mode << 13UL | 0x10UL;
} else if (data[0] == ADDIDATA_WATCHDOG) {
/* Set the mode : */
/* - Disable the hardware */
/* - Disable the counter mode */
/* - Disable the warning */
/* - Disable the reset */
/* - Disable the timer mode */
ui_Command = ui_Command & 0xFFF819E2UL;
} else { } else {
if (data[0] == ADDIDATA_WATCHDOG) { dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");
return -EINVAL;
/* Set the mode : */
/* - Disable the hardware */
/* - Disable the counter mode */
/* - Disable the warning */
/* - Disable the reset */
/* - Disable the timer mode */
ui_Command = ui_Command & 0xFFF819E2UL;
} else {
dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");
return -EINVAL;
}
} }
outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12); outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
ui_Command = 0; ui_Command = 0;
ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12); ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
@ -626,11 +625,9 @@ static void v_APCI035_Interrupt(int irq, void *d)
/* Read the digital temperature value */ /* Read the digital temperature value */
ui_DigitalTemperature = inl(devpriv->iobase + 128 + 60); ui_DigitalTemperature = inl(devpriv->iobase + 128 + 60);
send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */ send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
}
else { } else if ((ui_StatusRegister2 & 0x1) == 0x1) {
if ((ui_StatusRegister2 & 0x1) == 0x1) send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
} }
return; return;