|
@@ -506,11 +506,12 @@ static int platform_drv_probe(struct device *_dev)
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
- acpi_dev_pm_attach(_dev, true);
|
|
|
-
|
|
|
- ret = drv->probe(dev);
|
|
|
- if (ret)
|
|
|
- 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");
|
|
@@ -532,7 +533,7 @@ static int platform_drv_remove(struct device *_dev)
|
|
|
int ret;
|
|
|
|
|
|
ret = drv->remove(dev);
|
|
|
- acpi_dev_pm_detach(_dev, true);
|
|
|
+ dev_pm_domain_detach(_dev, true);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -543,7 +544,7 @@ static void platform_drv_shutdown(struct device *_dev)
|
|
|
struct platform_device *dev = to_platform_device(_dev);
|
|
|
|
|
|
drv->shutdown(dev);
|
|
|
- acpi_dev_pm_detach(_dev, true);
|
|
|
+ dev_pm_domain_detach(_dev, true);
|
|
|
}
|
|
|
|
|
|
/**
|