Commit 2e670ded authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

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: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4f59927d

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -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);