]> git.karo-electronics.de Git - linux-beck.git/commitdiff
acer-wmi: Use acpi_dev_found()
authorLukas Wunner <lukas@wunner.de>
Thu, 24 Mar 2016 12:15:20 +0000 (13:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 9 Apr 2016 01:12:59 +0000 (03:12 +0200)
Use shiny new acpi_dev_found() and remove all the boilerplate
to search for a particular ACPI device. No functional change.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/platform/x86/acer-wmi.c

index 1062fa42ff26c622cd261fc52f797947bf621542..79d64ea00bfb7e17fa908020e62c029dd01ff483 100644 (file)
@@ -793,15 +793,6 @@ static acpi_status __init AMW0_find_mailled(void)
        return AE_OK;
 }
 
-static int AMW0_set_cap_acpi_check_device_found __initdata;
-
-static acpi_status __init AMW0_set_cap_acpi_check_device_cb(acpi_handle handle,
-       u32 level, void *context, void **retval)
-{
-       AMW0_set_cap_acpi_check_device_found = 1;
-       return AE_OK;
-}
-
 static const struct acpi_device_id norfkill_ids[] __initconst = {
        { "VPC2004", 0},
        { "IBM0068", 0},
@@ -816,9 +807,10 @@ static int __init AMW0_set_cap_acpi_check_device(void)
        const struct acpi_device_id *id;
 
        for (id = norfkill_ids; id->id[0]; id++)
-               acpi_get_devices(id->id, AMW0_set_cap_acpi_check_device_cb,
-                               NULL, NULL);
-       return AMW0_set_cap_acpi_check_device_found;
+               if (acpi_dev_found(id->id))
+                       return true;
+
+       return false;
 }
 
 static acpi_status __init AMW0_set_capabilities(void)