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: Ulf Hansson <ulf.hansson@linaro.org>
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>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ca935df80c88..72a0beb1fafa 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -264,10 +264,12 @@ static int spi_drv_probe(struct device *dev)
         if (ret)
                 return ret;
 
-        acpi_dev_pm_attach(dev, true);
-        ret = sdrv->probe(to_spi_device(dev));
-        if (ret)
-                acpi_dev_pm_detach(dev, true);
+        ret = dev_pm_domain_attach(dev, true);
+        if (ret != -EPROBE_DEFER) {
+                ret = sdrv->probe(to_spi_device(dev));
+                if (ret)
+                        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;
 }