summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2009-03-25 19:20:10 +0000
committerWim Van Sebroeck <wim@iguana.be>2009-04-08 06:06:29 +0000
commitbd4e6c18ae02a492094621072e540df02e866f61 (patch)
treea7c7c46b7ea8ce3cc9fb571b3cf995c60bbfc8b5
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
downloadlinux-3.10-bd4e6c18ae02a492094621072e540df02e866f61.tar.gz
linux-3.10-bd4e6c18ae02a492094621072e540df02e866f61.tar.bz2
linux-3.10-bd4e6c18ae02a492094621072e540df02e866f61.zip
[WATCHDOG] i6300esb.c: Cleanup
Cleanup to keep checkpatch.pl happy. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/i6300esb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 2dbe83570d6..cfbb01c4316 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -52,10 +52,10 @@
#define ESB_LOCK_REG 0x68 /* WDT lock register */
/* Memory mapped registers */
-#define ESB_TIMER1_REG BASEADDR + 0x00 /* Timer1 value after each reset */
-#define ESB_TIMER2_REG BASEADDR + 0x04 /* Timer2 value after each reset */
-#define ESB_GINTSR_REG BASEADDR + 0x08 /* General Interrupt Status Register */
-#define ESB_RELOAD_REG BASEADDR + 0x0c /* Reload register */
+#define ESB_TIMER1_REG (BASEADDR + 0x00)/* Timer1 value after each reset */
+#define ESB_TIMER2_REG (BASEADDR + 0x04)/* Timer2 value after each reset */
+#define ESB_GINTSR_REG (BASEADDR + 0x08)/* General Interrupt Status Register */
+#define ESB_RELOAD_REG (BASEADDR + 0x0c)/* Reload register */
/* Lock register bits */
#define ESB_WDT_FUNC (0x01 << 2) /* Watchdog functionality */
@@ -143,7 +143,7 @@ static int esb_timer_stop(void)
spin_unlock(&esb_lock);
/* Returns 0 if the timer was disabled, non-zero otherwise */
- return (val & 0x01);
+ return val & 0x01;
}
static void esb_timer_keepalive(void)