From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux ACPI <linux-acpi@vger.kernel.org>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Hans de Goede <hdegoede@redhat.com>,
Erik Kaneda <erik.kaneda@intel.com>,
Joe Perches <joe@perches.com>
Subject: [PATCH v1 1/5] ACPI: AC: Clean up printing messages
Date: Mon, 01 Feb 2021 19:15:31 +0100 [thread overview]
Message-ID: <1712686.ktuFUgcqXO@kreacher> (raw)
In-Reply-To: <2367702.B5bJTmGzJm@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Replace the ACPI_DEBUG_PRINT() and ACPI_EXCEPTION() instances
in ac.c with acpi_handle_debug() and acpi_handle_info() calls,
respectively, 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 <rafael.j.wysocki@intel.com>
---
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_DISASSEMBLER 0x00000800
ACPI_COMPILER 0x00001000
ACPI_TOOLS 0x00002000
- ACPI_AC_COMPONENT 0x00020000
ACPI_BATTERY_COMPONENT 0x00040000
ACPI_BUTTON_COMPONENT 0x00080000
ACPI_SBS_COMPONENT 0x00100000
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,
&ac->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 0x00020000
#define ACPI_BATTERY_COMPONENT 0x00040000
#define ACPI_BUTTON_COMPONENT 0x00080000
#define ACPI_SBS_COMPONENT 0x00100000
next prev parent reply other threads:[~2021-02-01 18:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 18:14 [PATCH v1 0/5] ACPI: More cleanups related to printing messages Rafael J. Wysocki
2021-02-01 18:15 ` Rafael J. Wysocki [this message]
2021-02-01 18:16 ` [PATCH v1 2/5] ACPI: battery: Clean up " Rafael J. Wysocki
2021-02-01 18:35 ` Joe Perches
2021-02-01 18:44 ` Rafael J. Wysocki
2021-02-02 13:38 ` Joe Perches
2021-02-02 14:09 ` Rafael J. Wysocki
2021-02-01 18:17 ` [PATCH v1 3/5] ACPI: button: " Rafael J. Wysocki
2021-02-01 18:18 ` [PATCH v1 4/5] ACPI: video: " Rafael J. Wysocki
2021-02-01 18:19 ` [PATCH v1 5/5] ACPI: thermal: " Rafael J. Wysocki
2021-02-02 18:11 ` [PATCH v2 0/5] ACPI: More cleanups related to " Rafael J. Wysocki
2021-02-02 18:14 ` [PATCH v2 1/5] ACPI: AC: Clean up " Rafael J. Wysocki
2021-02-03 1:31 ` Hanjun Guo
2021-02-03 18:27 ` Rafael J. Wysocki
2021-02-02 18:15 ` [PATCH v2 2/5] ACPI: battery: " Rafael J. Wysocki
2021-02-03 1:44 ` Hanjun Guo
2021-02-02 18:17 ` [PATCH v2 3/5] ACPI: button: " Rafael J. Wysocki
2021-02-03 1:56 ` Hanjun Guo
2021-02-02 18:18 ` [PATCH v2 4/5] ACPI: video: " Rafael J. Wysocki
2021-02-03 2:16 ` Hanjun Guo
2021-02-02 18:19 ` [PATCH v2 5/5] ACPI: thermal: " Rafael J. Wysocki
2021-02-03 2:23 ` Hanjun Guo
2021-02-03 18:40 ` [PATCH v3 0/5] ACPI: More cleanups related to " Rafael J. Wysocki
2021-02-03 18:43 ` [PATCH v3 1/5] ACPI: AC: Clean up " Rafael J. Wysocki
2021-02-04 1:12 ` Hanjun Guo
2021-02-04 18:25 ` Hans de Goede
2021-02-03 18:44 ` [PATCH v3 2/5] ACPI: battery: " Rafael J. Wysocki
2021-02-04 1:18 ` Hanjun Guo
2021-02-04 18:27 ` Hans de Goede
2021-02-04 18:31 ` Hans de Goede
2021-02-03 18:46 ` [PATCH v3 3/5] ACPI: button: " Rafael J. Wysocki
2021-02-04 18:28 ` Hans de Goede
2021-02-03 18:48 ` [PATCH v3 4/5] ACPI: video: " Rafael J. Wysocki
2021-02-04 1:42 ` Hanjun Guo
2021-02-04 18:33 ` Hans de Goede
2021-02-03 18:49 ` [PATCH v3 5/5] ACPI: thermal: " Rafael J. Wysocki
2021-02-04 18:36 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1712686.ktuFUgcqXO@kreacher \
--to=rjw@rjwysocki.net \
--cc=erik.kaneda@intel.com \
--cc=hdegoede@redhat.com \
--cc=joe@perches.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).