diff options
author | Hanjun Guo <guohanjun@huawei.com> | 2021-06-02 10:54:29 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-07 15:36:45 +0200 |
commit | 2e670deddaa5b8b6d98554664ebc2fa723a30e9b (patch) | |
tree | 0b7cba69ffe1f9b442ac098a1c38524b50c32b4c /drivers | |
parent | ACPI: nvs: Unify the message printing (diff) | |
download | linux-2e670deddaa5b8b6d98554664ebc2fa723a30e9b.tar.xz linux-2e670deddaa5b8b6d98554664ebc2fa723a30e9b.zip |
ACPI: osl: Remove the duplicated PREFIX for message printing
We have pr_fmt() in osl.c, so pr_err(PREFIX ...) is duplicated
and wrong, fix it by removing the PREFIX.
Also remove the using of PREFIX in WARN() and just add the plain
"ACPI: " in message to keep it unchanged.
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 327e1b4eb6b0..1207490b0a50 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -212,7 +212,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) return efi.acpi20; if (efi.acpi != EFI_INVALID_TABLE_ADDR) return efi.acpi; - pr_err(PREFIX "System description tables not found\n"); + pr_err("System description tables not found\n"); } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { acpi_find_root_pointer(&pa); } @@ -430,7 +430,7 @@ void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size) map = acpi_map_lookup_virt(virt, size); if (!map) { mutex_unlock(&acpi_ioremap_lock); - WARN(true, PREFIX "%s: bad address %p\n", __func__, virt); + WARN(true, "ACPI: %s: bad address %p\n", __func__, virt); return; } acpi_os_drop_map_ref(map); |