diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-10-31 00:03:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 02:37:31 +0100 |
| commit | 318db8f03bc06e6de98e98a568b6b2fa64233b87 (patch) | |
| tree | 44d5709f1e619bdffcff6e159e0fed49e917dc43 /drivers/char/hpet.c | |
| parent | [PATCH] hpet: remove superfluous indirections (diff) | |
| download | linux-318db8f03bc06e6de98e98a568b6b2fa64233b87.tar.xz linux-318db8f03bc06e6de98e98a568b6b2fa64233b87.zip | |
[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 '')
| -rw-r--r-- | drivers/char/hpet.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index cf325622b396..0159c463f0f9 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) { |