Commit 318db8f0 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Linus Torvalds

[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: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: Bob Picco <bob.picco@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c860ed9f
...@@ -798,7 +798,7 @@ int hpet_alloc(struct hpet_data *hdp) ...@@ -798,7 +798,7 @@ int hpet_alloc(struct hpet_data *hdp)
size_t siz; size_t siz;
struct hpet __iomem *hpet; struct hpet __iomem *hpet;
static struct hpets *last = (struct hpets *)0; static struct hpets *last = (struct hpets *)0;
unsigned long ns, period; unsigned long period;
unsigned long long temp; unsigned long long temp;
/* /*
...@@ -863,10 +863,9 @@ int hpet_alloc(struct hpet_data *hdp) ...@@ -863,10 +863,9 @@ int hpet_alloc(struct hpet_data *hdp)
printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
printk("\n"); printk("\n");
ns = period / 1000000; /* convert to nanoseconds, 10^-9 */ printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",
printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n", hpetp->hp_which, hpetp->hp_ntimer,
hpetp->hp_which, ns, hpetp->hp_ntimer, cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq);
cap & HPET_COUNTER_SIZE_MASK ? 64 : 32);
mcfg = readq(&hpet->hpet_config); mcfg = readq(&hpet->hpet_config);
if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment