Merge tag 'driver-core-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / acpi / scan.c

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f7771a3..566270d 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -763,18 +763,16 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 }
 EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);
 
-static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
-                                       struct acpi_device_wakeup *wakeup)
+static int acpi_bus_extract_wakeup_device_power_package(struct acpi_device *dev)
 {
+       acpi_handle handle = dev->handle;
+       struct acpi_device_wakeup *wakeup = &dev->wakeup;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        union acpi_object *package = NULL;
        union acpi_object *element = NULL;
        acpi_status status;
        int err = -ENODATA;
 
-       if (!wakeup)
-               return -EINVAL;
-
        INIT_LIST_HEAD(&wakeup->resources);
 
        /* _PRW */
@@ -848,9 +846,9 @@ static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
 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;
@@ -883,8 +881,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
        if (!acpi_has_method(device->handle, "_PRW"))
                return;
 
-       err = acpi_bus_extract_wakeup_device_power_package(device->handle,
-                                                          &device->wakeup);
+       err = acpi_bus_extract_wakeup_device_power_package(device);
        if (err) {
                dev_err(&device->dev, "_PRW evaluation error: %d\n", err);
                return;
@@ -895,7 +892,7 @@ static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
        /*
         * Call _PSW/_DSW object to disable its ability to wake the sleeping
         * system for the ACPI device with the _PRW object.
-        * The _PSW object is depreciated in ACPI 3.0 and is replaced by _DSW.
+        * The _PSW object is deprecated in ACPI 3.0 and is replaced by _DSW.
         * So it is necessary to call _DSW object first. Only when it is not
         * present will the _PSW object used.
         */
@@ -2260,7 +2257,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
 
        mutex_lock(&acpi_probe_mutex);
        for (ape = ap_head; nr; ape++, nr--) {
-               if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
+               if (ACPI_COMPARE_NAMESEG(ACPI_SIG_MADT, ape->id)) {
                        acpi_probe_count = 0;
                        acpi_table_parse_madt(ape->type, acpi_match_madt, 0);
                        count += acpi_probe_count;