Skip to content

Commit

Permalink
drivercore / platform: Convert to dev_pm_domain_attach|detach()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ulf Hansson authored and Rafael J. Wysocki committed Sep 22, 2014
1 parent 46420dd commit cb51841
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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;
}
Expand All @@ -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);
}

/**
Expand Down

0 comments on commit cb51841

Please sign in to comment.