From: Al Stone ahs3@redhat.com
Signed-off-by: Al Stone al.stone@linaro.org --- drivers/acpi/osl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bdabc89..b80aa07 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -266,7 +266,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"); + pr_err("failed to find rsdp info\n"); *pa = (acpi_physical_address)NULL; return; } @@ -293,7 +293,7 @@ void acpi_find_arm_root_pointer(acpi_physical_address *pa)
*pa = (acpi_physical_address)(virt_to_phys(rp)); } else { - printk(KERN_ERR "(E) ACPI missing rsdp info\n"); + pr_err("ACPI 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;