提交 cb518413 编写于 作者: U Ulf Hansson 提交者: Rafael J. Wysocki

drivercore / platform: Convert to dev_pm_domain_attach|detach()

Previously only the ACPI PM domain was supported by the platform bus.

Let's convert to the common attach/detach functions for PM domains,
which currently means we are extending the support to include the
generic PM domain as well.
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>
Tested-by: NPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: NKevin Hilman <khilman@linaro.org>
Reviewed-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
上级 46420dd7
...@@ -506,11 +506,12 @@ static int platform_drv_probe(struct device *_dev) ...@@ -506,11 +506,12 @@ static int platform_drv_probe(struct device *_dev)
if (ret < 0) if (ret < 0)
return ret; return ret;
acpi_dev_pm_attach(_dev, true); ret = dev_pm_domain_attach(_dev, true);
if (ret != -EPROBE_DEFER) {
ret = drv->probe(dev); ret = drv->probe(dev);
if (ret) if (ret)
acpi_dev_pm_detach(_dev, true); dev_pm_domain_detach(_dev, true);
}
if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) { if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
dev_warn(_dev, "probe deferral not supported\n"); dev_warn(_dev, "probe deferral not supported\n");
...@@ -532,7 +533,7 @@ static int platform_drv_remove(struct device *_dev) ...@@ -532,7 +533,7 @@ static int platform_drv_remove(struct device *_dev)
int ret; int ret;
ret = drv->remove(dev); ret = drv->remove(dev);
acpi_dev_pm_detach(_dev, true); dev_pm_domain_detach(_dev, true);
return ret; return ret;
} }
...@@ -543,7 +544,7 @@ static void platform_drv_shutdown(struct device *_dev) ...@@ -543,7 +544,7 @@ static void platform_drv_shutdown(struct device *_dev)
struct platform_device *dev = to_platform_device(_dev); struct platform_device *dev = to_platform_device(_dev);
drv->shutdown(dev); drv->shutdown(dev);
acpi_dev_pm_detach(_dev, true); dev_pm_domain_detach(_dev, true);
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册