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>

diff --git a/Documentation/firmware-guide/acpi/debug.rst b/Documentation/firmware-guide/acpi/debug.rst
index 60d877913da3c4da0bceaefbf5c0b55883789494..67a5ad75a52e9fdb46056d042dd603b2f55d2f57 100644 (file)
--- a/Documentation/firmware-guide/acpi/debug.rst
+++ b/Documentation/firmware-guide/acpi/debug.rst
@@ -52,7 +52,6 @@ shows the supported mask values, currently these::
     ACPI_CA_DISASSEMBLER            0x00000800
     ACPI_COMPILER                   0x00001000
     ACPI_TOOLS                      0x00002000
-    ACPI_BUTTON_COMPONENT           0x00080000
     ACPI_SBS_COMPONENT              0x00100000
     ACPI_FAN_COMPONENT              0x00200000
     ACPI_PCI_COMPONENT              0x00400000

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 0d93a5ef4d0710a1d9dc5f1260bd114b4e4d5008..85e5e0328a2e4beaa74896cbae077325e0b13f5d 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -21,8 +21,6 @@
 #include <linux/dmi.h>
 #include <acpi/button.h>
 
-#define PREFIX "ACPI: "
-
 #define ACPI_BUTTON_CLASS              "button"
 #define ACPI_BUTTON_FILE_STATE         "state"
 #define ACPI_BUTTON_TYPE_UNKNOWN       0x00
@@ -54,9 +52,6 @@ static const char * const lid_init_state_str[] = {
        [ACPI_BUTTON_LID_INIT_DISABLED]         = "disabled",
 };
 
-#define _COMPONENT             ACPI_BUTTON_COMPONENT
-ACPI_MODULE_NAME("button");
-
 MODULE_AUTHOR("Paul Diefenbaugh");
 MODULE_DESCRIPTION("ACPI Button Driver");
 MODULE_LICENSE("GPL");
@@ -285,7 +280,7 @@ static int acpi_button_add_fs(struct acpi_device *device)
                return 0;
 
        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;
        }
 
@@ -434,8 +429,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
                }
                break;
        default:
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Unsupported event [0x%x]\n", event));
+               acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",
+                                 event);
                break;
        }
 }
@@ -523,7 +518,7 @@ static int acpi_button_add(struct acpi_device *device)
                        ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
                input->open = acpi_lid_input_open;
        } else {
-               printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid);
+               pr_info("Unsupported hid [%s]\n", hid);
                error = -ENODEV;
                goto err_free_input;
        }
@@ -567,7 +562,7 @@ static int acpi_button_add(struct acpi_device *device)
        }
 
        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;
 
  err_remove_fs:

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 4d3eec9dc0ee9bf00b978d5050dba762fd1d23bd..152e8eec6f13de1fe2cdb0dfc048965fd766090c 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -52,7 +52,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = {
        ACPI_DEBUG_INIT(ACPI_COMPILER),
        ACPI_DEBUG_INIT(ACPI_TOOLS),
 
-       ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT),

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 8fc70b273c343b2bcc907cd4eabe19cf00efb46c..25df44b2ed251875fe79aebbc29e5cc48b6d7f81 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/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_BUTTON_COMPONENT          0x00080000
 #define ACPI_SBS_COMPONENT             0x00100000
 #define ACPI_FAN_COMPONENT             0x00200000
 #define ACPI_PCI_COMPONENT             0x00400000