openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: button: Clean up printing messages 

Replace the ACPI_DEBUG_PRINT() instance in button.c with an
acpi_handle_debug() call, drop the _COMPONENT and ACPI_MODULE_NAME()
definitions that are not used any more, drop the no longer needed
ACPI_BUTTON_COMPONENT definition from the headers and update the
documentation accordingly.

While at it, replace the direct printk() invocations with pr_info()
(that changes the excessive log level for some of them too) and drop
the unneeded PREFIX sybmbol definition from battery.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Rafael J. Wysocki 2021-02-03 19:46:14 +01:00
parent bd8c5d1ee3
commit 411e3216d4
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/firmware-guide/acpi/debug.rst
View File

@ -52,7 +52,6 @@ shows the supported mask values, currently these::
ACPI_CA_DISASSEMBLER 0x00000800 ACPI_CA_DISASSEMBLER 0x00000800
ACPI_COMPILER 0x00001000 ACPI_COMPILER 0x00001000
ACPI_TOOLS 0x00002000 ACPI_TOOLS 0x00002000
ACPI_BUTTON_COMPONENT 0x00080000
ACPI_SBS_COMPONENT 0x00100000 ACPI_SBS_COMPONENT 0x00100000
ACPI_FAN_COMPONENT 0x00200000 ACPI_FAN_COMPONENT 0x00200000
ACPI_PCI_COMPONENT 0x00400000 ACPI_PCI_COMPONENT 0x00400000

15
drivers/acpi/button.c
View File

@ -21,8 +21,6 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <acpi/button.h> #include <acpi/button.h>
#define PREFIX "ACPI: "
#define ACPI_BUTTON_CLASS "button" #define ACPI_BUTTON_CLASS "button"
#define ACPI_BUTTON_FILE_STATE "state" #define ACPI_BUTTON_FILE_STATE "state"
#define ACPI_BUTTON_TYPE_UNKNOWN 0x00 #define ACPI_BUTTON_TYPE_UNKNOWN 0x00
@ -54,9 +52,6 @@ static const char * const lid_init_state_str[] = {
[ACPI_BUTTON_LID_INIT_DISABLED] = "disabled", [ACPI_BUTTON_LID_INIT_DISABLED] = "disabled",
}; };
#define _COMPONENT ACPI_BUTTON_COMPONENT
ACPI_MODULE_NAME("button");
MODULE_AUTHOR("Paul Diefenbaugh"); MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION("ACPI Button Driver"); MODULE_DESCRIPTION("ACPI Button Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
@ -285,7 +280,7 @@ static int acpi_button_add_fs(struct acpi_device *device)
return 0; return 0;
if (acpi_button_dir || acpi_lid_dir) { if (acpi_button_dir || acpi_lid_dir) {
printk(KERN_ERR PREFIX "More than one Lid device found!\n"); pr_info("More than one Lid device found!\n");
return -EEXIST; return -EEXIST;
} }
@ -434,8 +429,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
} }
break; break;
default: default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO, acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",
"Unsupported event [0x%x]\n", event)); event);
break; break;
} }
} }
@ -523,7 +518,7 @@ static int acpi_button_add(struct acpi_device *device)
ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
input->open = acpi_lid_input_open; input->open = acpi_lid_input_open;
} else { } else {
printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid); pr_info("Unsupported hid [%s]\n", hid);
error = -ENODEV; error = -ENODEV;
goto err_free_input; goto err_free_input;
} }
@ -567,7 +562,7 @@ static int acpi_button_add(struct acpi_device *device)
} }
device_init_wakeup(&device->dev, true); device_init_wakeup(&device->dev, true);
printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device)); pr_info("%s [%s]\n", name, acpi_device_bid(device));
return 0; return 0;
err_remove_fs: err_remove_fs:

1
drivers/acpi/sysfs.c
View File

@ -52,7 +52,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = {
ACPI_DEBUG_INIT(ACPI_COMPILER), ACPI_DEBUG_INIT(ACPI_COMPILER),
ACPI_DEBUG_INIT(ACPI_TOOLS), ACPI_DEBUG_INIT(ACPI_TOOLS),
ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT),
ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT), ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),
ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT), ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT),
ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT), ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT),

1
include/acpi/acpi_drivers.h
View File

@ -15,7 +15,6 @@
* Please update drivers/acpi/debug.c and Documentation/firmware-guide/acpi/debug.rst * Please update drivers/acpi/debug.c and Documentation/firmware-guide/acpi/debug.rst
* if you add to this list. * if you add to this list.
*/ */
#define ACPI_BUTTON_COMPONENT 0x00080000
#define ACPI_SBS_COMPONENT 0x00100000 #define ACPI_SBS_COMPONENT 0x00100000
#define ACPI_FAN_COMPONENT 0x00200000 #define ACPI_FAN_COMPONENT 0x00200000
#define ACPI_PCI_COMPONENT 0x00400000 #define ACPI_PCI_COMPONENT 0x00400000