summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDavid John <davidjon@xenontk.org>2008-10-10 08:12:44 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-10 09:25:43 +0200
commitf26ed116c0baa8f9cbbe3d5db84034d75f6250f8 (patch)
tree92dc8d0901bdd707967c2055375acadda5b8929a /drivers/char
parentMerge commit 'v2.6.27' into timers/hpet (diff)
downloadlinux-f26ed116c0baa8f9cbbe3d5db84034d75f6250f8.tar.xz
linux-f26ed116c0baa8f9cbbe3d5db84034d75f6250f8.zip
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.c4
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)
hdp->hd_address = ioremap(addr.minimum, addr.address_length);
if (hpet_is_known(hdp)) {
- printk(KERN_DEBUG "%s: 0x%lx is busy\n",
- __func__, hdp->hd_phys_address);
iounmap(hdp->hd_address);
return AE_ALREADY_EXISTS;
}
@@ -914,8 +912,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
HPET_RANGE_SIZE);
if (hpet_is_known(hdp)) {
- printk(KERN_DEBUG "%s: 0x%lx is busy\n",
- __func__, hdp->hd_phys_address);
iounmap(hdp->hd_address);
return AE_ALREADY_EXISTS;
}