Commit 2fb65f09 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki

ACPI / osl: Refactor acpi_os_get_root_pointer() to drop 'else':s

There are few 'else' keywords which are redundant in
acpi_os_get_root_pointer(). Refactor function to get rid of them.

While here, switch to pr_err() instead of printk(KERN_ERR ...).
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5dcb9ca8
...@@ -188,6 +188,8 @@ early_param("acpi_rsdp", setup_acpi_rsdp); ...@@ -188,6 +188,8 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
acpi_physical_address __init acpi_os_get_root_pointer(void) acpi_physical_address __init acpi_os_get_root_pointer(void)
{ {
acpi_physical_address pa = 0;
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
if (acpi_rsdp) if (acpi_rsdp)
return acpi_rsdp; return acpi_rsdp;
...@@ -196,21 +198,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) ...@@ -196,21 +198,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
if (efi_enabled(EFI_CONFIG_TABLES)) { if (efi_enabled(EFI_CONFIG_TABLES)) {
if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
return efi.acpi20; return efi.acpi20;
else if (efi.acpi != EFI_INVALID_TABLE_ADDR) if (efi.acpi != EFI_INVALID_TABLE_ADDR)
return efi.acpi; return efi.acpi;
else { pr_err(PREFIX "System description tables not found\n");
printk(KERN_ERR PREFIX
"System description tables not found\n");
return 0;
}
} else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) {
acpi_physical_address pa = 0;
acpi_find_root_pointer(&pa); acpi_find_root_pointer(&pa);
return pa;
} }
return 0; return pa;
} }
/* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment