]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
HPET: Remove spurious HPET busy warning message.
authorDavid John <davidjon@xenontk.org>
Fri, 10 Oct 2008 06:12:44 +0000 (11:42 +0530)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 07:25:43 +0000 (09:25 +0200)
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>
drivers/char/hpet.c

index 2908a0eb63afa1d704cd81ffed5a03a26731d976..f3cfb4c761259d5b8f6d331c24ea1108fde307fc 100644 (file)
@@ -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;
                }