diff options
author | David John <davidjon@xenontk.org> | 2008-10-10 02:12:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:43 -0400 |
commit | f26ed116c0baa8f9cbbe3d5db84034d75f6250f8 (patch) | |
tree | 92dc8d0901bdd707967c2055375acadda5b8929a /drivers/char | |
parent | 8eb95f28f66b1a5461fdbcc9a1ee9068fb2cf2b6 (diff) |
HPET: Remove spurious HPET busy warning message.
On x86 systems with CONFIG_HPET_TIMER enabled, when
the HPET driver (drivers/char/hpet.c) is loaded,
an incorrect busy message is printed when the driver
initializes since the HPET has already been allocated
by the core timer code. Remove the warning message.
Signed-off-by: David John <davidjon@xenontk.org>
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hpet.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 2908a0eb63af..f3cfb4c76125 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -897,8 +897,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
897 | hdp->hd_address = ioremap(addr.minimum, addr.address_length); | 897 | hdp->hd_address = ioremap(addr.minimum, addr.address_length); |
898 | 898 | ||
899 | if (hpet_is_known(hdp)) { | 899 | if (hpet_is_known(hdp)) { |
900 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | ||
901 | __func__, hdp->hd_phys_address); | ||
902 | iounmap(hdp->hd_address); | 900 | iounmap(hdp->hd_address); |
903 | return AE_ALREADY_EXISTS; | 901 | return AE_ALREADY_EXISTS; |
904 | } | 902 | } |
@@ -914,8 +912,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
914 | HPET_RANGE_SIZE); | 912 | HPET_RANGE_SIZE); |
915 | 913 | ||
916 | if (hpet_is_known(hdp)) { | 914 | if (hpet_is_known(hdp)) { |
917 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | ||
918 | __func__, hdp->hd_phys_address); | ||
919 | iounmap(hdp->hd_address); | 915 | iounmap(hdp->hd_address); |
920 | return AE_ALREADY_EXISTS; | 916 | return AE_ALREADY_EXISTS; |
921 | } | 917 | } |