Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb518413 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 46420dd7

drivers/base/platform.c

+8 −7
Original line number Diff line number Diff line
@@ -506,11 +506,12 @@ static int platform_drv_probe(struct device *_dev) 
	if (ret < 0)

		return ret;



	acpi_dev_pm_attach(_dev, true);



	ret = dev_pm_domain_attach(_dev, true);

	if (ret != -EPROBE_DEFER) {

		ret = drv->probe(dev);

		if (ret)

		acpi_dev_pm_detach(_dev, true);

			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);

}



/**