i2c: core: Convert to dev_pm_domain_attach|detach()

Previously only the ACPI PM domain was supported by the i2c 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>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 632057a44615..3cd8f11f1b5f 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -279,10 +279,13 @@ static int i2c_device_probe(struct device *dev)
         if (status < 0)
                 return status;
 
-        acpi_dev_pm_attach(&client->dev, true);
-        status = driver->probe(client, i2c_match_id(driver->id_table, client));
-        if (status)
-                acpi_dev_pm_detach(&client->dev, true);
+        status = dev_pm_domain_attach(&client->dev, true);
+        if (status != -EPROBE_DEFER) {
+                status = driver->probe(client, i2c_match_id(driver->id_table,
+                                        client));
+                if (status)
+                        dev_pm_domain_detach(&client->dev, true);
+        }
 
         return status;
 }
@@ -302,7 +305,7 @@ static int i2c_device_remove(struct device *dev)
                 status = driver->remove(client);
         }
 
-        acpi_dev_pm_detach(&client->dev, true);
+        dev_pm_domain_detach(&client->dev, true);
         return status;
 }