diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-10-30 18:03:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:31 -0500 |
commit | 318db8f03bc06e6de98e98a568b6b2fa64233b87 (patch) | |
tree | 44d5709f1e619bdffcff6e159e0fed49e917dc43 /drivers | |
parent | c860ed9fb5d320407f99190ab2e31bfe74db6724 (diff) |
[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.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) | |||
798 | size_t siz; | 798 | size_t siz; |
799 | struct hpet __iomem *hpet; | 799 | struct hpet __iomem *hpet; |
800 | static struct hpets *last = (struct hpets *)0; | 800 | static struct hpets *last = (struct hpets *)0; |
801 | unsigned long ns, period; | 801 | unsigned long period; |
802 | unsigned long long temp; | 802 | unsigned long long temp; |
803 | 803 | ||
804 | /* | 804 | /* |
@@ -863,10 +863,9 @@ int hpet_alloc(struct hpet_data *hdp) | |||
863 | printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); | 863 | printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); |
864 | printk("\n"); | 864 | printk("\n"); |
865 | 865 | ||
866 | ns = period / 1000000; /* convert to nanoseconds, 10^-9 */ | 866 | printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n", |
867 | printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n", | 867 | hpetp->hp_which, hpetp->hp_ntimer, |
868 | hpetp->hp_which, ns, hpetp->hp_ntimer, | 868 | cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq); |
869 | cap & HPET_COUNTER_SIZE_MASK ? 64 : 32); | ||
870 | 869 | ||
871 | mcfg = readq(&hpet->hpet_config); | 870 | mcfg = readq(&hpet->hpet_config); |
872 | if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { | 871 | if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { |