mmc: sdio: Convert to dev_pm_domain_attach|detach()

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

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 4fa8fef9147f75ec4e9ff974957093bb28f0ec6a..1df0fc63c17c878921ae4504286ec60edfa69b5b 100644 (file)
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -315,7 +315,7 @@ int sdio_add_func(struct sdio_func *func)
        ret = device_add(&func->dev);
        if (ret == 0) {
                sdio_func_set_present(func);
-               acpi_dev_pm_attach(&func->dev, false);
+               dev_pm_domain_attach(&func->dev, false);
        }
 
        return ret;
@@ -332,7 +332,7 @@ void sdio_remove_func(struct sdio_func *func)
        if (!sdio_func_present(func))
                return;
 
-       acpi_dev_pm_detach(&func->dev, false);
+       dev_pm_domain_detach(&func->dev, false);
        device_del(&func->dev);
        put_device(&func->dev);
 }