After the message printing cleanups to decouple with ACPICA, the message printing in ACPI subsystem still have the room for improvement. For now we use both PREFIX "ACPI: " and pr_*() macros for message print in ACPI subsystem, they are misused in follwing ways: - Duplicated prefix. For example in sysfs.c we have pr_fmt() but we still use pr_err(PREFIX ...), which is worng; - Using pr_*() macros without pr_fmt(), but some pr_*() calls added the PREFIX and some didn't in the same file; - Mixed use of printk(PREFIX) and pr_*() macros in one driver but don't have the same prefix for message printing. All the above will confuse people, sometimes leads to write some wrong message printing code, so just use pr_fmt() and pr_*() macros to generate a unified format string, and remove the using of PREFIX "ACPI: " in ACPI drivers, finally remove PREFIX "ACPI: " definition in the internal.h, which prevent further misuse of the PREFIX. Also remove some in-house DBG code which is not useful, replace with pr_debug() instead. Hanjun Guo (18): ACPI: cmos_rtc: Using pr_fmt() and remove PREFIX ACPI: blacklist: Unify the message printing ACPI: bus: Use pr_*() macros to replace printk() ACPI: event: Use pr_*() macros to replace printk() ACPI: glue: Clean up the printing messages ACPI: nvs: Unify the message printing ACPI: osl: Remove the duplicated PREFIX for message printing ACPI: pci_root: Unify the message printing ACPI: processor_thermal: Remove unused PREFIX for printing ACPI: processor_perflib: Cleanup print messages ACPI: processor_throttling: Cleanup the printing messages ACPI: reboot: Unify the message printing ACPI: sysfs: Cleanup message printing ACPI: sbshc: Unify the message printing ACPI: scan: Unify the log message printing ACPI: sbs: Unify the message printing ACPI: sleep: Unify the message printing ACPI: Remove the macro PREFIX "ACPI: " drivers/acpi/acpi_cmos_rtc.c | 6 ++-- drivers/acpi/blacklist.c | 9 +++--- drivers/acpi/bus.c | 4 +-- drivers/acpi/event.c | 6 ++-- drivers/acpi/glue.c | 29 ++++++------------ drivers/acpi/internal.h | 2 -- drivers/acpi/nvs.c | 8 +++-- drivers/acpi/osl.c | 4 +-- drivers/acpi/pci_root.c | 4 ++- drivers/acpi/processor_perflib.c | 38 +++++++++++------------ drivers/acpi/processor_thermal.c | 2 -- drivers/acpi/processor_throttling.c | 60 ++++++++++++++++--------------------- drivers/acpi/reboot.c | 4 ++- drivers/acpi/sbs.c | 12 ++++---- drivers/acpi/sbshc.c | 8 ++--- drivers/acpi/scan.c | 11 +++---- drivers/acpi/sleep.c | 18 +++++------ drivers/acpi/sysfs.c | 8 ++--- 18 files changed, 109 insertions(+), 124 deletions(-) -- 1.7.12.4