diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-01-23 00:38:00 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-05-12 12:52:34 +0200 |
| commit | 571dce4f105cf2b8e57ec4330da71bd0cb6d38bb (patch) | |
| tree | f1bc23d2923c2ef9c3de927368bb4266ea61acba /drivers/mmc | |
| parent | 42dcc89a914722635814ae405cfdacfeccad82d1 (diff) | |
| download | blackbird-op-linux-571dce4f105cf2b8e57ec4330da71bd0cb6d38bb.tar.gz blackbird-op-linux-571dce4f105cf2b8e57ec4330da71bd0cb6d38bb.zip | |
mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM
Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM
callbacks. This means the callbacks becomes available for both
CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed to handle the
combinations of these scenarios.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 0f10e3ccb944..eb23c89b2717 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1789,7 +1789,7 @@ static int mmci_resume(struct device *dev) } #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static void mmci_save(struct mmci_host *host) { unsigned long flags; @@ -1857,7 +1857,7 @@ static int mmci_runtime_resume(struct device *dev) static const struct dev_pm_ops mmci_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume) - SET_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) + SET_PM_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL) }; static struct amba_id mmci_ids[] = { |
