Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: button: move HIDs to acpi/button.h

This makes it possible to use ACPI_BUTTON_HID_POWER in another driver.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Josh Triplett and committed by
Rafael J. Wysocki
ac1cc6b4 bb6d3fb3

+4 -3
-3
drivers/acpi/button.c
··· 30 30 #define ACPI_BUTTON_NOTIFY_STATUS 0x80 31 31 32 32 #define ACPI_BUTTON_SUBCLASS_POWER "power" 33 - #define ACPI_BUTTON_HID_POWER "PNP0C0C" 34 33 #define ACPI_BUTTON_DEVICE_NAME_POWER "Power Button" 35 34 #define ACPI_BUTTON_TYPE_POWER 0x01 36 35 37 36 #define ACPI_BUTTON_SUBCLASS_SLEEP "sleep" 38 - #define ACPI_BUTTON_HID_SLEEP "PNP0C0E" 39 37 #define ACPI_BUTTON_DEVICE_NAME_SLEEP "Sleep Button" 40 38 #define ACPI_BUTTON_TYPE_SLEEP 0x03 41 39 42 40 #define ACPI_BUTTON_SUBCLASS_LID "lid" 43 - #define ACPI_BUTTON_HID_LID "PNP0C0D" 44 41 #define ACPI_BUTTON_DEVICE_NAME_LID "Lid Switch" 45 42 #define ACPI_BUTTON_TYPE_LID 0x05 46 43
+4
include/acpi/button.h
··· 2 2 #ifndef ACPI_BUTTON_H 3 3 #define ACPI_BUTTON_H 4 4 5 + #define ACPI_BUTTON_HID_POWER "PNP0C0C" 6 + #define ACPI_BUTTON_HID_LID "PNP0C0D" 7 + #define ACPI_BUTTON_HID_SLEEP "PNP0C0E" 8 + 5 9 #if IS_ENABLED(CONFIG_ACPI_BUTTON) 6 10 extern int acpi_lid_open(void); 7 11 #else