Re: [PATCH v2 1/5] ACPI: AC: Clean up printing messages
On Wednesday, February 3, 2021 2:31:08 AM CET Hanjun Guo wrote: > Hi Rafael, > > On 2021/2/3 2:14, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki > > > > Replace the ACPI_DEBUG_PRINT() and ACPI_EXCEPTION() instances > > in ac.c with acpi_handle_debug() and acpi_handle_info() calls, > > respectively, which among other things causes the excessive log > > level of the messages previously printed via ACPI_EXCEPTION() to > > be more adequate. > > > > Drop the _COMPONENT and ACPI_MODULE_NAME() definitions that are not > > used any more, drop the no longer needed ACPI_AC_COMPONENT definition > > from the headers and update the documentation accordingly. > > > > Signed-off-by: Rafael J. Wysocki > > --- > > > > v1 -> v2: Changelog update > > > > --- > > Documentation/firmware-guide/acpi/debug.rst |1 - > > drivers/acpi/ac.c | 12 +--- > > drivers/acpi/sysfs.c|1 - > > include/acpi/acpi_drivers.h |1 - > > 4 files changed, 5 insertions(+), 10 deletions(-) > > > > Index: linux-pm/Documentation/firmware-guide/acpi/debug.rst > > === > > --- linux-pm.orig/Documentation/firmware-guide/acpi/debug.rst > > +++ linux-pm/Documentation/firmware-guide/acpi/debug.rst > > @@ -52,7 +52,6 @@ shows the supported mask values, current > > ACPI_CA_DISASSEMBLER0x0800 > > ACPI_COMPILER 0x1000 > > ACPI_TOOLS 0x2000 > > -ACPI_AC_COMPONENT 0x0002 > > ACPI_BATTERY_COMPONENT 0x0004 > > ACPI_BUTTON_COMPONENT 0x0008 > > ACPI_SBS_COMPONENT 0x0010 > > Index: linux-pm/drivers/acpi/ac.c > > === > > --- linux-pm.orig/drivers/acpi/ac.c > > +++ linux-pm/drivers/acpi/ac.c > > In this file, printk() is still using, how about convert them > all into pr_*? I think patch on top your or update this patch > are both OK. Good idea. Thanks for all of the comments. They will be addressed in the v3 that will be posted shortly.
Re: [PATCH v2 1/5] ACPI: AC: Clean up printing messages
Hi Rafael, On 2021/2/3 2:14, Rafael J. Wysocki wrote: From: Rafael J. Wysocki Replace the ACPI_DEBUG_PRINT() and ACPI_EXCEPTION() instances in ac.c with acpi_handle_debug() and acpi_handle_info() calls, respectively, which among other things causes the excessive log level of the messages previously printed via ACPI_EXCEPTION() to be more adequate. Drop the _COMPONENT and ACPI_MODULE_NAME() definitions that are not used any more, drop the no longer needed ACPI_AC_COMPONENT definition from the headers and update the documentation accordingly. Signed-off-by: Rafael J. Wysocki --- v1 -> v2: Changelog update --- Documentation/firmware-guide/acpi/debug.rst |1 - drivers/acpi/ac.c | 12 +--- drivers/acpi/sysfs.c|1 - include/acpi/acpi_drivers.h |1 - 4 files changed, 5 insertions(+), 10 deletions(-) Index: linux-pm/Documentation/firmware-guide/acpi/debug.rst === --- linux-pm.orig/Documentation/firmware-guide/acpi/debug.rst +++ linux-pm/Documentation/firmware-guide/acpi/debug.rst @@ -52,7 +52,6 @@ shows the supported mask values, current ACPI_CA_DISASSEMBLER0x0800 ACPI_COMPILER 0x1000 ACPI_TOOLS 0x2000 -ACPI_AC_COMPONENT 0x0002 ACPI_BATTERY_COMPONENT 0x0004 ACPI_BUTTON_COMPONENT 0x0008 ACPI_SBS_COMPONENT 0x0010 Index: linux-pm/drivers/acpi/ac.c === --- linux-pm.orig/drivers/acpi/ac.c +++ linux-pm/drivers/acpi/ac.c In this file, printk() is still using, how about convert them all into pr_*? I think patch on top your or update this patch are both OK. Thanks Hanjun
[PATCH v2 1/5] ACPI: AC: Clean up printing messages
From: Rafael J. Wysocki
Replace the ACPI_DEBUG_PRINT() and ACPI_EXCEPTION() instances
in ac.c with acpi_handle_debug() and acpi_handle_info() calls,
respectively, which among other things causes the excessive log
level of the messages previously printed via ACPI_EXCEPTION() to
be more adequate.
Drop the _COMPONENT and ACPI_MODULE_NAME() definitions that are not
used any more, drop the no longer needed ACPI_AC_COMPONENT definition
from the headers and update the documentation accordingly.
Signed-off-by: Rafael J. Wysocki
---
v1 -> v2: Changelog update
---
Documentation/firmware-guide/acpi/debug.rst |1 -
drivers/acpi/ac.c | 12 +---
drivers/acpi/sysfs.c|1 -
include/acpi/acpi_drivers.h |1 -
4 files changed, 5 insertions(+), 10 deletions(-)
Index: linux-pm/Documentation/firmware-guide/acpi/debug.rst
===
--- linux-pm.orig/Documentation/firmware-guide/acpi/debug.rst
+++ linux-pm/Documentation/firmware-guide/acpi/debug.rst
@@ -52,7 +52,6 @@ shows the supported mask values, current
ACPI_CA_DISASSEMBLER0x0800
ACPI_COMPILER 0x1000
ACPI_TOOLS 0x2000
-ACPI_AC_COMPONENT 0x0002
ACPI_BATTERY_COMPONENT 0x0004
ACPI_BUTTON_COMPONENT 0x0008
ACPI_SBS_COMPONENT 0x0010
Index: linux-pm/drivers/acpi/ac.c
===
--- linux-pm.orig/drivers/acpi/ac.c
+++ linux-pm/drivers/acpi/ac.c
@@ -28,9 +28,6 @@
#define ACPI_AC_STATUS_ONLINE 0x01
#define ACPI_AC_STATUS_UNKNOWN 0xFF
-#define _COMPONENT ACPI_AC_COMPONENT
-ACPI_MODULE_NAME("ac");
-
MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION("ACPI AC Adapter Driver");
MODULE_LICENSE("GPL");
@@ -102,8 +99,9 @@ static int acpi_ac_get_state(struct acpi
status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL,
>state);
if (ACPI_FAILURE(status)) {
- ACPI_EXCEPTION((AE_INFO, status,
- "Error reading AC Adapter state"));
+ acpi_handle_info(ac->device->handle,
+ "Error reading AC Adapter state: %s\n",
+ acpi_format_exception(status));
ac->state = ACPI_AC_STATUS_UNKNOWN;
return -ENODEV;
}
@@ -153,8 +151,8 @@ static void acpi_ac_notify(struct acpi_d
switch (event) {
default:
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "Unsupported event [0x%x]\n", event));
+ acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",
+ event);
fallthrough;
case ACPI_AC_NOTIFY_STATUS:
case ACPI_NOTIFY_BUS_CHECK:
Index: linux-pm/drivers/acpi/sysfs.c
===
--- linux-pm.orig/drivers/acpi/sysfs.c
+++ linux-pm/drivers/acpi/sysfs.c
@@ -52,7 +52,6 @@ static const struct acpi_dlayer acpi_deb
ACPI_DEBUG_INIT(ACPI_COMPILER),
ACPI_DEBUG_INIT(ACPI_TOOLS),
- ACPI_DEBUG_INIT(ACPI_AC_COMPONENT),
ACPI_DEBUG_INIT(ACPI_BATTERY_COMPONENT),
ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT),
ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),
Index: linux-pm/include/acpi/acpi_drivers.h
===
--- linux-pm.orig/include/acpi/acpi_drivers.h
+++ linux-pm/include/acpi/acpi_drivers.h
@@ -15,7 +15,6 @@
* Please update drivers/acpi/debug.c and
Documentation/firmware-guide/acpi/debug.rst
* if you add to this list.
*/
-#define ACPI_AC_COMPONENT 0x0002
#define ACPI_BATTERY_COMPONENT 0x0004
#define ACPI_BUTTON_COMPONENT 0x0008
#define ACPI_SBS_COMPONENT 0x0010
