From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org,
Ian Molton <ian.molton@codethink.co.uk>,
Chris Ball <chris@printf.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Linux-sh list <linux-sh@vger.kernel.org>,
linux-kernel@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 07/12] mmc: tmio: Make runtime PM callbacks available for CONFIG_PM
Date: Mon, 25 Aug 2014 14:25:59 +0200 [thread overview]
Message-ID: <1408969564-6335-8-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1408969564-6335-1-git-send-email-ulf.hansson@linaro.org>
To give the option for tmio hosts to use the runtime PM callbacks for
CONFIG_PM_SLEEP as well as CONFIG_PM_RUNTIME, move them to CONFIG_PM.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/host/tmio_mmc.h | 2 +-
drivers/mmc/host/tmio_mmc_pio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index f1ee3e4..2ad52d6 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -149,7 +149,7 @@ int tmio_mmc_host_suspend(struct device *dev);
int tmio_mmc_host_resume(struct device *dev);
#endif
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
int tmio_mmc_host_runtime_suspend(struct device *dev);
int tmio_mmc_host_runtime_resume(struct device *dev);
#endif
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index d52280d..494ecc5 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1162,7 +1162,7 @@ int tmio_mmc_host_resume(struct device *dev)
EXPORT_SYMBOL(tmio_mmc_host_resume);
#endif
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
int tmio_mmc_host_runtime_suspend(struct device *dev)
{
struct mmc_host *mmc = dev_get_drvdata(dev);
--
1.9.1
next prev parent reply other threads:[~2014-08-25 12:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-25 12:25 [PATCH 00/12] mmc: tmio: Fixup PM support Ulf Hansson
2014-08-25 12:25 ` [PATCH 01/12] mmc: tmio: Keep host active while SDIO IRQ is enabled Ulf Hansson
2014-08-25 12:25 ` [PATCH 02/12] mmc: tmio: Keep host active while serving requests Ulf Hansson
2014-08-25 12:25 ` [PATCH 03/12] mmc: tmio: Extract bus_width modifications to a separate function Ulf Hansson
2014-08-25 12:25 ` [PATCH 04/12] mmc: tmio: Restructure ->set_ios() and adapt ->probe() to it Ulf Hansson
2014-08-25 12:25 ` [PATCH 05/12] mmc: tmio: Handle clock gating from runtime PM functions Ulf Hansson
2014-08-25 12:25 ` [PATCH 06/12] mmc: tmio: Mask all IRQs when inactive Ulf Hansson
2014-08-25 12:25 ` Ulf Hansson [this message]
2014-08-25 12:26 ` [PATCH 08/12] mmc: sdhi: Make runtime PM callbacks available for CONFIG_PM Ulf Hansson
2014-08-25 12:26 ` [PATCH 09/12] mmc: tmio_mmc: Enable runtime PM support Ulf Hansson
2014-08-25 12:26 ` [PATCH 10/12] mmc: sdhi: Fixup system PM suspend lock-up Ulf Hansson
2014-08-26 7:43 ` Geert Uytterhoeven
2014-08-25 12:26 ` [PATCH 11/12] mmc: tmio_mmc: " Ulf Hansson
2014-08-25 12:26 ` [PATCH 12/12] mmc: tmio: Remove library functions for system PM Ulf Hansson
2014-08-26 7:46 ` [PATCH 00/12] mmc: tmio: Fixup PM support Geert Uytterhoeven
2014-08-27 12:59 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408969564-6335-8-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=chris@printf.net \
--cc=geert@linux-m68k.org \
--cc=ian.molton@codethink.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).