diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-19 14:27:40 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-22 09:57:40 -0400 |
commit | 397a0253527a578fa036d3438ad4909c65d63166 (patch) | |
tree | 8e8531610aa94f065ad00324bfd1baa0e42dc408 | |
parent | e09b0d4e9b03e08f47ad53e3c509db2cf8f1dc9c (diff) |
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>
-rw-r--r-- | drivers/mmc/core/sdio_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 4fa8fef9147f..1df0fc63c17c 100644 --- 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) | |||
315 | ret = device_add(&func->dev); | 315 | ret = device_add(&func->dev); |
316 | if (ret == 0) { | 316 | if (ret == 0) { |
317 | sdio_func_set_present(func); | 317 | sdio_func_set_present(func); |
318 | acpi_dev_pm_attach(&func->dev, false); | 318 | dev_pm_domain_attach(&func->dev, false); |
319 | } | 319 | } |
320 | 320 | ||
321 | return ret; | 321 | return ret; |
@@ -332,7 +332,7 @@ void sdio_remove_func(struct sdio_func *func) | |||
332 | if (!sdio_func_present(func)) | 332 | if (!sdio_func_present(func)) |
333 | return; | 333 | return; |
334 | 334 | ||
335 | acpi_dev_pm_detach(&func->dev, false); | 335 | dev_pm_domain_detach(&func->dev, false); |
336 | device_del(&func->dev); | 336 | device_del(&func->dev); |
337 | put_device(&func->dev); | 337 | put_device(&func->dev); |
338 | } | 338 | } |