openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ulf Hansson 2014-09-19 20:27:38 +02:00 committed by Rafael J. Wysocki
parent 46420dd73b
commit cb51841397
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/base/platform.c
View File

@ -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);
}
/**