Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macro

Browse source 
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>
This commit is contained in:
dann frazier 2010-06-02 16:23:39 -06:00 committed by Wim Van Sebroeck
parent 6b7f3d5321
commit e802e32d2b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/watchdog/hpwdt.c
View file

@ -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;
}