Merge tag 'mmc-v3.18-1' of git://git.linaro.org/people/ulf.hansson/mmc

[linux-2.6-block.git] / drivers / mmc / core / sdio_bus.c

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 4fa8fef9147f75ec4e9ff974957093bb28f0ec6a..6da97b170563a8f6bebfba78779d8cb20ffa78bb 100644 (file)
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -16,6 +16,7 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
 #include <linux/acpi.h>
 
 #include <linux/mmc/card.h>
@@ -177,8 +178,8 @@ static int sdio_bus_remove(struct device *dev)
        drv->remove(func);
 
        if (func->irq_handler) {
-               pr_warning("WARNING: driver %s did not remove "
-                       "its interrupt handler!\n", drv->name);
+               pr_warn("WARNING: driver %s did not remove its interrupt handler!\n",
+                       drv->name);
                sdio_claim_host(func);
                sdio_release_irq(func);
                sdio_release_host(func);
@@ -315,7 +316,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 +333,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);
 }