[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1275517421-10544-1-git-send-email-dannf@hp.com>
Date: Wed, 2 Jun 2010 16:23:39 -0600
From: dann frazier <dannf@...com>
To: Wim Van Sebroeck <wim@...ana.be>
Cc: linux-kernel@...r.kernel.org,
Thomas Mingarelli <thomas.mingarelli@...com>,
dann frazier <dannf@...com>
Subject: [PATCH 1/3] hpwdt: Introduce SECS_TO_TICKS() macro
Define a macro to convert from seconds to timer ticks.
Signed-off-by: dann frazier <dannf@...com>
---
drivers/watchdog/hpwdt.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 809e716..af61fb6 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -49,6 +49,8 @@
#define ROM_SIZE 0x10000
#define HPWDT_VERSION "1.1.1"
+#define SECS_TO_TICKS(secs) ((secs) * 1000 / 128)
+
struct bios32_service_dir {
u32 signature;
u32 entry_point;
@@ -420,7 +422,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);
}
@@ -453,7 +455,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;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists