diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/i6300esb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index 2dbe83570d65..cfbb01c43163 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c | |||
| @@ -52,10 +52,10 @@ | |||
| 52 | #define ESB_LOCK_REG 0x68 /* WDT lock register */ | 52 | #define ESB_LOCK_REG 0x68 /* WDT lock register */ |
| 53 | 53 | ||
| 54 | /* Memory mapped registers */ | 54 | /* Memory mapped registers */ |
| 55 | #define ESB_TIMER1_REG BASEADDR + 0x00 /* Timer1 value after each reset */ | 55 | #define ESB_TIMER1_REG (BASEADDR + 0x00)/* Timer1 value after each reset */ |
| 56 | #define ESB_TIMER2_REG BASEADDR + 0x04 /* Timer2 value after each reset */ | 56 | #define ESB_TIMER2_REG (BASEADDR + 0x04)/* Timer2 value after each reset */ |
| 57 | #define ESB_GINTSR_REG BASEADDR + 0x08 /* General Interrupt Status Register */ | 57 | #define ESB_GINTSR_REG (BASEADDR + 0x08)/* General Interrupt Status Register */ |
| 58 | #define ESB_RELOAD_REG BASEADDR + 0x0c /* Reload register */ | 58 | #define ESB_RELOAD_REG (BASEADDR + 0x0c)/* Reload register */ |
| 59 | 59 | ||
| 60 | /* Lock register bits */ | 60 | /* Lock register bits */ |
| 61 | #define ESB_WDT_FUNC (0x01 << 2) /* Watchdog functionality */ | 61 | #define ESB_WDT_FUNC (0x01 << 2) /* Watchdog functionality */ |
| @@ -143,7 +143,7 @@ static int esb_timer_stop(void) | |||
| 143 | spin_unlock(&esb_lock); | 143 | spin_unlock(&esb_lock); |
| 144 | 144 | ||
| 145 | /* Returns 0 if the timer was disabled, non-zero otherwise */ | 145 | /* Returns 0 if the timer was disabled, non-zero otherwise */ |
| 146 | return (val & 0x01); | 146 | return val & 0x01; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static void esb_timer_keepalive(void) | 149 | static void esb_timer_keepalive(void) |