diff options
| -rw-r--r-- | drivers/base/platform.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 842b43813563..a8b09596a469 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -496,12 +496,12 @@ static int platform_drv_probe(struct device *_dev) if (ret < 0) return ret; - if (ACPI_HANDLE(_dev)) - acpi_dev_pm_attach(_dev, true); - - ret = drv->probe(dev); - if (ret && ACPI_HANDLE(_dev)) - acpi_dev_pm_detach(_dev, true); + ret = dev_pm_domain_attach(_dev, true); + if (ret != -EPROBE_DEFER) { + ret = drv->probe(dev); + if (ret) + dev_pm_domain_detach(_dev, true); + } if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { dev_warn(_dev, "probe deferral not supported\n"); @@ -523,8 +523,7 @@ static int platform_drv_remove(struct device *_dev) int ret; ret = drv->remove(dev); - if (ACPI_HANDLE(_dev)) - acpi_dev_pm_detach(_dev, true); + dev_pm_domain_detach(_dev, true); return ret; } @@ -535,8 +534,7 @@ static void platform_drv_shutdown(struct device *_dev) struct platform_device *dev = to_platform_device(_dev); drv->shutdown(dev); - if (ACPI_HANDLE(_dev)) - acpi_dev_pm_detach(_dev, true); + dev_pm_domain_detach(_dev, true); } /** |