From: Al Stone ahs3@redhat.com

Signed-off-by: Al Stone al.stone@linaro.org --- arch/arm/kernel/acpi/boot.c | 6 ------ drivers/acpi/osl.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/arch/arm/kernel/acpi/boot.c b/arch/arm/kernel/acpi/boot.c index 8848024..be1e5d2 100644 --- a/arch/arm/kernel/acpi/boot.c +++ b/arch/arm/kernel/acpi/boot.c @@ -1390,7 +1390,6 @@ void __init acpi_boot_table_init(void) return; }

- printk(KERN_INFO "(I) acpi_table_init call completed\n"); acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);

/* @@ -1406,7 +1405,6 @@ void __init acpi_boot_table_init(void) } }

- printk(KERN_INFO "(I) exit acpi_boot_table_init\n"); }

int __init early_acpi_boot_init(void) @@ -1417,8 +1415,6 @@ int __init early_acpi_boot_init(void) if (acpi_disabled) return 1;

- printk(KERN_INFO "enter early_acpi_boot_init\n"); - /* * Process the Multiple APIC Description Table (MADT), if present */ @@ -1435,8 +1431,6 @@ int __init acpi_boot_init(void) if (acpi_disabled) return 1;

- printk(KERN_INFO "enter acpi_boot_init\n"); - acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);

/* diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 1e17bfd..42255a1 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -253,7 +253,7 @@ void acpi_find_arm_root_pointer(acpi_physical_address *pa) * What we do is, while using u-boot still, is use the values * that have already been retrieved from the FDT node * (/chosen/linux,acpi-start and /chosen/linux,acpi-len) which - * contain the address of the first byte of the RSDP after it + * contain the address of the first byte of the RSDP after it * has been loaded into RAM during u-boot (e.g., using something * like fatload mmc 0:2 42008000 my.blob), and the size of the * data in the complete ACPI blob. We only do this since we have @@ -267,7 +267,7 @@ void acpi_find_arm_root_pointer(acpi_physical_address *pa) struct acpi_table_rsdp *rp;

if (!acpi_arm_rsdp_info.phys_address && !acpi_arm_rsdp_info.size) { - printk(KERN_ERR "(E) ACPI: failed to find rsdp info\n"); + printk(KERN_ERR PREFIX "failed to find rsdp info\n"); *pa = (acpi_physical_address)NULL; return; } @@ -277,25 +277,25 @@ void acpi_find_arm_root_pointer(acpi_physical_address *pa) *pa = (acpi_physical_address)address;

rp = (struct acpi_table_rsdp *)address; - printk(KERN_DEBUG "(I) ACPI rsdp rp: 0x%08lx\n", (long unsigned int)rp); + printk(KERN_DEBUG PREFIX "rsdp rp: 0x%08lx\n", (long unsigned int)rp); if (rp) { - printk(KERN_DEBUG "(I) ACPI rsdp content:\n"); - printk(KERN_DEBUG "(I) signature: %.8s\n", rp->signature); - printk(KERN_DEBUG "(I) checksum: 0x%02x\n", rp->checksum); - printk(KERN_DEBUG "(I) oem_id: %.6s\n", rp->oem_id); - printk(KERN_DEBUG "(I) revision: %d\n", rp->revision); - printk(KERN_DEBUG "(I) rsdt: 0x%08lX\n", + printk(KERN_DEBUG PREFIX "rsdp content:\n"); + printk(KERN_DEBUG PREFIX " signature: %.8s\n", rp->signature); + printk(KERN_DEBUG PREFIX " checksum: 0x%02x\n", rp->checksum); + printk(KERN_DEBUG PREFIX " oem_id: %.6s\n", rp->oem_id); + printk(KERN_DEBUG PREFIX " revision: %d\n", rp->revision); + printk(KERN_DEBUG PREFIX " rsdt: 0x%08lX\n", (long unsigned int)rp->rsdt_physical_address); - printk(KERN_DEBUG "(I) length: %d\n", rp->length); - printk(KERN_DEBUG "(I) xsdt: 0x%016llX\n", + printk(KERN_DEBUG PREFIX " length: %d\n", rp->length); + printk(KERN_DEBUG PREFIX " xsdt: 0x%016llX\n", (u64)rp->xsdt_physical_address); - printk(KERN_DEBUG "(I) x_checksum: 0x%02x\n", + printk(KERN_DEBUG PREFIX " x_checksum: 0x%02x\n", rp->extended_checksum);

*pa = (acpi_physical_address)(virt_to_phys(rp)); } else { - printk(KERN_ERR "(E) ACPI missing rsdp info\n"); + printk(KERN_ERR PREFIX "missing rsdp info\n"); *pa = (acpi_physical_address)NULL; }

@@ -1324,7 +1324,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout) jiffies = MAX_SCHEDULE_TIMEOUT; else jiffies = msecs_to_jiffies(timeout); - + ret = down_timeout(sem, jiffies); if (ret) status = AE_TIME;