diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-19 20:27:38 +0200 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2015-02-11 13:07:33 +0800 |
| commit | 8e1724184d42d05be48fe3c06df198722bfccae7 (patch) | |
| tree | 87edaae9f9214c3da90c80272dcd06b2aa58d998 | |
| parent | 7c11a6d71a049eb1f862f06168dd5ca740fa277e (diff) | |
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>
(cherry picked from commit cb51841397e8e5714cf82a7f91053f6e1fb80d1f)
(cherry picked from commit cd4edd4cb84f9dadb9e8f12b1e1f10bf2ef28749)
| -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); } /** |