git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40381a3
)
ACPI / scan: Add labels for PNP button devices
author
Bjorn Helgaas
<bhelgaas@google.com>
Mon, 25 Mar 2019 18:34:03 +0000
(13:34 -0500)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 26 Mar 2019 21:36:46 +0000
(22:36 +0100)
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>
drivers/acpi/scan.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/scan.c
b/drivers/acpi/scan.c
index f3fb1fa79429fcc8ec195d768f51daf69655b4cf..2297440a0622838c1ea8b98b6541844f6e92be44 100644
(file)
--- 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)
static bool acpi_wakeup_gpe_init(struct acpi_device *device)
{
static const struct acpi_device_id button_device_ids[] = {
- {"PNP0C0C", 0},
- {"PNP0C0D", 0},
- {"PNP0C0E", 0},
+ {"PNP0C0C", 0},
/* Power button */
+ {"PNP0C0D", 0},
/* Lid */
+ {"PNP0C0E", 0},
/* Sleep button */
{"", 0},
};
struct acpi_device_wakeup *wakeup = &device->wakeup;