summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-10-30 15:03:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:31 -0800
commit318db8f03bc06e6de98e98a568b6b2fa64233b87 (patch)
tree44d5709f1e619bdffcff6e159e0fed49e917dc43 /drivers
parentc860ed9fb5d320407f99190ab2e31bfe74db6724 (diff)
downloadop-kernel-dev-318db8f03bc06e6de98e98a568b6b2fa64233b87.zip
op-kernel-dev-318db8f03bc06e6de98e98a568b6b2fa64233b87.tar.gz
[PATCH] hpet: simplify initialization message
When booting, display the timer frequency in Hertz instead of as tick length in nanoseconds. Apart from saving a local variable, this makes the message more easily comprehensible. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/hpet.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index cf325622..0159c46 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -798,7 +798,7 @@ int hpet_alloc(struct hpet_data *hdp)
size_t siz;
struct hpet __iomem *hpet;
static struct hpets *last = (struct hpets *)0;
- unsigned long ns, period;
+ unsigned long period;
unsigned long long temp;
/*
@@ -863,10 +863,9 @@ int hpet_alloc(struct hpet_data *hdp)
printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
printk("\n");
- ns = period / 1000000; /* convert to nanoseconds, 10^-9 */
- printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n",
- hpetp->hp_which, ns, hpetp->hp_ntimer,
- cap & HPET_COUNTER_SIZE_MASK ? 64 : 32);
+ printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",
+ hpetp->hp_which, hpetp->hp_ntimer,
+ cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq);
mcfg = readq(&hpet->hpet_config);
if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {
OpenPOWER on IntegriCloud