diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-06-12 13:07:02 +0300 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-06-13 22:43:21 +0200 |
| commit | a3487d8f30635e3fa9db986cee6fca8012a996f4 (patch) | |
| tree | 21762e7ad8afd2ce5c0baff02ea13bd857c28878 /drivers/acpi/sleep.c | |
| parent | ACPI / LPIT: Correct LPIT end address for lpit_process() (diff) | |
| download | linux-dev-a3487d8f30635e3fa9db986cee6fca8012a996f4.tar.xz linux-dev-a3487d8f30635e3fa9db986cee6fca8012a996f4.zip | |
ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()
Switch the acpi_pm_finish() to use acpi_dev_get_first_match_dev() instead of
custom approach.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index e52f1238d2d6..e21a0f5fdadd 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -454,14 +454,6 @@ static int acpi_pm_prepare(void) return error; } -static int find_powerf_dev(struct device *dev, void *data) -{ - struct acpi_device *device = to_acpi_device(dev); - const char *hid = acpi_device_hid(device); - - return !strcmp(hid, ACPI_BUTTON_HID_POWERF); -} - /** * acpi_pm_finish - Instruct the platform to leave a sleep state. * @@ -470,7 +462,7 @@ static int find_powerf_dev(struct device *dev, void *data) */ static void acpi_pm_finish(void) { - struct device *pwr_btn_dev; + struct acpi_device *pwr_btn_adev; u32 acpi_state = acpi_target_sleep_state; acpi_ec_unblock_transactions(); @@ -501,11 +493,11 @@ static void acpi_pm_finish(void) return; pwr_btn_event_pending = false; - pwr_btn_dev = bus_find_device(&acpi_bus_type, NULL, NULL, - find_powerf_dev); - if (pwr_btn_dev) { - pm_wakeup_event(pwr_btn_dev, 0); - put_device(pwr_btn_dev); + pwr_btn_adev = acpi_dev_get_first_match_dev(ACPI_BUTTON_HID_POWERF, + NULL, -1); + if (pwr_btn_adev) { + pm_wakeup_event(&pwr_btn_adev->dev, 0); + acpi_dev_put(pwr_btn_adev); } } |