Commit 711b888e authored by Chase Southwood's avatar Chase Southwood Committed by Greg Kroah-Hartman

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

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: default avatarChase Southwood <chase.southwood@yahoo.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85b3842b
......@@ -207,23 +207,22 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
ui_Command =
(ui_Command & 0xFFF719E2UL) | ui_Mode << 13UL | 0x10UL;
} else {
if (data[0] == ADDIDATA_WATCHDOG) {
} 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 */
/* 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;
ui_Command = ui_Command & 0xFFF819E2UL;
} else {
dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");
return -EINVAL;
}
} 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);
ui_Command = 0;
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 */
ui_DigitalTemperature = inl(devpriv->iobase + 128 + 60);
send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
}
else {
if ((ui_StatusRegister2 & 0x1) == 0x1)
send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
} else if ((ui_StatusRegister2 & 0x1) == 0x1) {
send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
}
return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment