Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

[mirror_ubuntu-artful-kernel.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index bc78848dd59aec9af389b9ce8caa4be984c4cc42..e714709704e4578ccc3703ca30108e596461ad28 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -481,11 +481,10 @@ static int platform_drv_probe(struct device *_dev)
        struct platform_device *dev = to_platform_device(_dev);
        int ret;
 
-       if (ACPI_HANDLE(_dev))
-               acpi_dev_pm_attach(_dev, true);
+       acpi_dev_pm_attach(_dev, true);
 
        ret = drv->probe(dev);
-       if (ret && ACPI_HANDLE(_dev))
+       if (ret)
                acpi_dev_pm_detach(_dev, true);
 
        if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
@@ -508,8 +507,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);
+       acpi_dev_pm_detach(_dev, true);
 
        return ret;
 }
@@ -520,8 +518,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);
+       acpi_dev_pm_detach(_dev, true);
 }
 
 /**