From: Clemens Ladisch Date: Sun, 30 Oct 2005 23:03:41 +0000 (-0800) Subject: [PATCH] hpet: simplify initialization message X-Git-Tag: v2.6.15-rc1~59^2~15^2~14 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=318db8f03bc06e6de98e98a568b6b2fa64233b87;p=linux-2.6 [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 Cc: Bob Picco Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index cf325622b3..0159c463f0 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) {