Commit 24789075 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Hans de Goede
Browse files

platform: x86: ACPI: Get rid of ACPICA message printing 



A few x86 platform drivers use ACPI_DEBUG_PRINT() or ACPI_EXCEPTION()
for printing messages, but that is questionable, because those macros
belong to ACPICA and they should not be used elsewhere.  In addition,
ACPI_DEBUG_PRINT() requires special enabling to allow it to actually
print the message, which is a nuisance, and the _COMPONENT symbol
generally needed for that is not defined in any of the files in
question.

For this reason, replace the ACPI_DEBUG_PRINT() in lg-laptop.c with
pr_debug() and the one in xo15-ebook.c with acpi_handle_debug()
(with the additional benefit that the source object can be identified
more easily after this change).

Also drop the ACPI_MODULE_NAME() definitions that are only used by
the ACPICA message printing macros from those files and from wmi.c
and surfacepro3_button.c (while at it).

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/2074665.VPHYfYaQb6@kreacher


[hdegoede@redhat.com: Drop acer-wmi.c chunk, a similar patch was already merged]
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent d9ff4ec3

drivers/platform/surface/surfacepro3_button.c

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ static const guid_t MSHW0040_DSM_UUID = 
#define SURFACE_BUTTON_NOTIFY_PRESS_VOLUME_DOWN		0xc2

#define SURFACE_BUTTON_NOTIFY_RELEASE_VOLUME_DOWN	0xc3



ACPI_MODULE_NAME("surface pro 3 button");



MODULE_AUTHOR("Chen Yu");

MODULE_DESCRIPTION("Surface Pro3 Button Driver");

MODULE_LICENSE("GPL v2");

drivers/platform/x86/lg-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static int __init acpi_init(void) 


	result = acpi_bus_register_driver(&acpi_driver);

	if (result < 0) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error registering driver\n"));

		pr_debug("Error registering driver\n");

		return -ENODEV;

	}

drivers/platform/x86/wmi.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/fs.h>

#include <uapi/linux/wmi.h>



ACPI_MODULE_NAME("wmi");

MODULE_AUTHOR("Carlos Corbacho");

MODULE_DESCRIPTION("ACPI-WMI Mapping Driver");

MODULE_LICENSE("GPL");

drivers/platform/x86/xo15-ebook.c

+2 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#define XO15_EBOOK_HID			"XO15EBK"

#define XO15_EBOOK_DEVICE_NAME		"EBook Switch"



ACPI_MODULE_NAME(MODULE_NAME);



MODULE_DESCRIPTION("OLPC XO-1.5 ebook switch driver");

MODULE_LICENSE("GPL");
@@ -66,8 +64,8 @@ static void ebook_switch_notify(struct acpi_device *device, u32 event) 
		ebook_send_state(device);

		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;

	}

}