diff options
| author | dann frazier <dannf@hp.com> | 2010-06-03 00:23:39 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2010-08-13 22:54:39 +0200 |
| commit | e802e32d2b42ce1384baf4e150f444477729aad2 (patch) | |
| tree | abbbd57b0fdc0cac171bd68878ab8788915fced4 /drivers/watchdog | |
| parent | watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strict (diff) | |
| download | linux-e802e32d2b42ce1384baf4e150f444477729aad2.tar.xz linux-e802e32d2b42ce1384baf4e150f444477729aad2.zip | |
watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro
Define a macro to convert from seconds to timer ticks.
Signed-off-by: dann frazier <dannf@hp.com>
Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 77ca72c0c6d5..a5d36ae350dd 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -35,6 +35,7 @@ #include <asm/cacheflush.h> #define HPWDT_VERSION "1.1.1" +#define SECS_TO_TICKS(secs) ((secs) * 1000 / 128) #define DEFAULT_MARGIN 30 static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ @@ -410,7 +411,7 @@ static int __devinit detect_cru_service(void) */ static void hpwdt_start(void) { - reload = (soft_margin * 1000) / 128; + reload = SECS_TO_TICKS(soft_margin); iowrite16(reload, hpwdt_timer_reg); iowrite16(0x85, hpwdt_timer_con); } @@ -443,7 +444,7 @@ static int hpwdt_change_timer(int new_margin) printk(KERN_DEBUG "hpwdt: New timer passed in is %d seconds.\n", new_margin); - reload = (soft_margin * 1000) / 128; + reload = SECS_TO_TICKS(soft_margin); return 0; } |