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

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

spi: core: Convert to dev_pm_domain_attach|detach() 



Previously only the ACPI PM domain was supported by the spi 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>
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 397a0253

drivers/spi/spi.c

+7 −5
Original line number Diff line number Diff line
@@ -264,10 +264,12 @@ static int spi_drv_probe(struct device *dev) 
	if (ret)

		return ret;



	acpi_dev_pm_attach(dev, true);

	ret = dev_pm_domain_attach(dev, true);

	if (ret != -EPROBE_DEFER) {

		ret = sdrv->probe(to_spi_device(dev));

		if (ret)

		acpi_dev_pm_detach(dev, true);

			dev_pm_domain_detach(dev, true);

	}



	return ret;

}
@@ -278,7 +280,7 @@ static int spi_drv_remove(struct device *dev) 
	int ret;



	ret = sdrv->remove(to_spi_device(dev));

	acpi_dev_pm_detach(dev, true);

	dev_pm_domain_detach(dev, true);



	return ret;

}