aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2019-03-25 14:34:03 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-26 17:36:46 -0400
commit5ceb5f0522bdc20d507fef2cd77fec2caa4e541e (patch)
tree06df91aee867de9f598dffa4f49ca096cf99299d
parent40381a3c1fa3ed37458c7f745e51fc81e9b48fe2 (diff)
ACPI / scan: Add labels for PNP button devices
Subsequent code treats button_device_ids[] entries differently, and it's hard to follow without a hint as to which is which. Add comments to identify the power button, lid, and sleep button devices. The "PNP" prefix is owned by Microsoft, so they distribute the canonical list of "PNP" IDs. Link: https://uefi.org/PNP_ACPI_Registry Link: https://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/devids.txt Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f3fb1fa79429..2297440a0622 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -846,9 +846,9 @@ static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev)
846static bool acpi_wakeup_gpe_init(struct acpi_device *device) 846static bool acpi_wakeup_gpe_init(struct acpi_device *device)
847{ 847{
848 static const struct acpi_device_id button_device_ids[] = { 848 static const struct acpi_device_id button_device_ids[] = {
849 {"PNP0C0C", 0}, 849 {"PNP0C0C", 0}, /* Power button */
850 {"PNP0C0D", 0}, 850 {"PNP0C0D", 0}, /* Lid */
851 {"PNP0C0E", 0}, 851 {"PNP0C0E", 0}, /* Sleep button */
852 {"", 0}, 852 {"", 0},
853 }; 853 };
854 struct acpi_device_wakeup *wakeup = &device->wakeup; 854 struct acpi_device_wakeup *wakeup = &device->wakeup;