All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ulf Hansson <ulf.hansson@linaro.org>
To: Russell King <linux@arm.linux.org.uk>,
	linux-arm-kernel@lists.infradead.org
Cc: Alessandro Rubini <rubini@unipv.it>,
	Linus Walleij <linus.walleij@linaro.org>,
	Wolfram Sang <wsa@the-dreams.de>, Chris Ball <chris@printf.net>,
	Mark Brown <broonie@kernel.org>,
	linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
	linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org,
	Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 04/17] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM
Date: Tue,  4 Feb 2014 16:58:45 +0100	[thread overview]
Message-ID: <1391529538-21685-5-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org>

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>
---
 drivers/mmc/host/mmci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 178868a..c88da1c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1753,7 +1753,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;
@@ -1821,7 +1821,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[] = {
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/17] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM
Date: Tue,  4 Feb 2014 16:58:45 +0100	[thread overview]
Message-ID: <1391529538-21685-5-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1391529538-21685-1-git-send-email-ulf.hansson@linaro.org>

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>
---
 drivers/mmc/host/mmci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 178868a..c88da1c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1753,7 +1753,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;
@@ -1821,7 +1821,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[] = {
-- 
1.7.9.5

  parent reply	other threads:[~2014-02-04 15:59 UTC|newest]

Thread overview: 147+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-04 15:58 [PATCH 00/17] amba: PM fixups for amba bus and some amba drivers Ulf Hansson
2014-02-04 15:58 ` Ulf Hansson
2014-02-04 15:58 ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 01/17] amba: Let runtime PM callbacks be available for CONFIG_PM Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-19  9:40   ` Russell King - ARM Linux
2014-02-19  9:40     ` Russell King - ARM Linux
2014-02-19  9:40     ` Russell King - ARM Linux
2014-02-19 11:40     ` Ulf Hansson
2014-02-19 11:40       ` Ulf Hansson
2014-02-19 11:40       ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 02/17] amba: Add late and early PM callbacks Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 03/17] mmc: mmci: Mask IRQs for all variants during runtime suspend Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-18 16:05   ` Russell King - ARM Linux
2014-02-18 16:05     ` Russell King - ARM Linux
2014-02-18 16:05     ` Russell King - ARM Linux
2014-02-18 16:36     ` Ulf Hansson
2014-02-18 16:36       ` Ulf Hansson
2014-02-18 16:36       ` Ulf Hansson
2014-02-18 16:46       ` Russell King - ARM Linux
2014-02-18 16:46         ` Russell King - ARM Linux
2014-02-18 16:46         ` Russell King - ARM Linux
2014-02-18 17:02         ` Ulf Hansson
2014-02-18 17:02           ` Ulf Hansson
2014-02-18 17:02           ` Ulf Hansson
2014-02-24 14:54       ` Linus Walleij
2014-02-24 14:54         ` Linus Walleij
2014-02-24 14:54         ` Linus Walleij
2014-02-04 15:58 ` Ulf Hansson [this message]
2014-02-04 15:58   ` [PATCH 04/17] mmc: mmci: Let runtime PM callbacks be available for CONFIG_PM Ulf Hansson
2014-02-04 15:58 ` [PATCH 05/17] mmc: mmci: Put the device into low power state at system suspend Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 19:22   ` Kevin Hilman
2014-02-04 19:22     ` Kevin Hilman
2014-02-04 19:22     ` Kevin Hilman
2014-02-05 12:49     ` Linus Walleij
2014-02-05 12:49       ` Linus Walleij
2014-02-05 12:49       ` Linus Walleij
2014-02-05 14:13       ` Mark Brown
2014-02-05 14:13         ` Mark Brown
2014-02-05 14:13         ` Mark Brown
2014-02-05 20:08       ` Kevin Hilman
2014-02-05 20:08         ` Kevin Hilman
2014-02-05 20:08         ` Kevin Hilman
2014-02-05 20:08         ` Kevin Hilman
2014-02-10 11:11     ` Ulf Hansson
2014-02-10 11:11       ` Ulf Hansson
2014-02-10 11:11       ` Ulf Hansson
2014-02-10 18:03       ` Kevin Hilman
2014-02-10 18:03         ` Kevin Hilman
2014-02-10 18:03         ` Kevin Hilman
2014-02-10 18:03         ` Kevin Hilman
2014-02-04 15:58 ` [PATCH 06/17] spi: pl022: Let runtime PM callbacks be available for CONFIG_PM Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-19 14:20   ` Ulf Hansson
2014-02-19 14:20     ` Ulf Hansson
2014-02-19 14:20     ` Ulf Hansson
2014-02-19 15:10     ` Mark Brown
2014-02-19 15:10       ` Mark Brown
2014-02-19 15:10       ` Mark Brown
2014-02-19 18:02       ` Ulf Hansson
2014-02-19 18:02         ` Ulf Hansson
2014-02-19 18:02         ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 07/17] spi: pl022: Don't ignore power domain and amba bus at system suspend Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 19:16   ` Mark Brown
2014-02-04 19:16     ` Mark Brown
2014-02-10 12:33     ` Ulf Hansson
2014-02-10 12:33       ` Ulf Hansson
2014-02-10 12:33       ` Ulf Hansson
2014-02-10 12:51       ` Mark Brown
2014-02-10 12:51         ` Mark Brown
2014-02-10 12:51         ` Mark Brown
2014-02-19 14:15         ` Ulf Hansson
2014-02-19 14:15           ` Ulf Hansson
2014-02-19 14:15           ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 08/17] spi: pl022: Fully gate clocks at request inactivity Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 17:07   ` Mark Brown
2014-02-04 17:07     ` Mark Brown
2014-02-04 17:07     ` Mark Brown
2014-02-10 10:36     ` Ulf Hansson
2014-02-10 10:36       ` Ulf Hansson
2014-02-10 10:36       ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 09/17] spi: pl022: Simplify clock handling Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 19:19   ` Mark Brown
2014-02-04 19:19     ` Mark Brown
2014-02-10 10:42     ` Ulf Hansson
2014-02-10 10:42       ` Ulf Hansson
2014-02-10 10:42       ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 10/17] spi: pl022: Remove redundant pinctrl to default state in probe Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 19:20   ` Mark Brown
2014-02-04 19:20     ` Mark Brown
2014-02-04 19:20     ` Mark Brown
2014-02-05 12:53   ` Linus Walleij
2014-02-05 12:53     ` Linus Walleij
2014-02-05 12:53     ` Linus Walleij
2014-02-04 15:58 ` [PATCH 11/17] i2c: nomadik: Convert to devm functions Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-05 14:32   ` Linus Walleij
2014-02-05 14:32     ` Linus Walleij
2014-02-05 14:32     ` Linus Walleij
2014-02-04 15:58 ` [PATCH 12/17] i2c: nomadik: Remove redundant call to pm_runtime_disable Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 13/17] i2c: nomadik: Leave probe with the device in active state Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 14/17] i2c: nomadik: Fixup deployment of runtime PM Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-05 14:34   ` Linus Walleij
2014-02-05 14:34     ` Linus Walleij
2014-02-05 14:34     ` Linus Walleij
2014-02-10 10:14     ` Ulf Hansson
2014-02-10 10:14       ` Ulf Hansson
2014-02-10 10:14       ` Ulf Hansson
2014-02-13 14:12       ` Ulf Hansson
2014-02-13 14:12         ` Ulf Hansson
2014-02-13 14:12         ` Ulf Hansson
2014-02-05 14:45   ` Fabio Estevam
2014-02-05 14:45     ` Fabio Estevam
2014-02-05 14:45     ` Fabio Estevam
2014-02-10 10:16     ` Ulf Hansson
2014-02-10 10:16       ` Ulf Hansson
2014-02-10 10:16       ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 15/17] i2c: nomadik: Convert to late and early system PM callbacks Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 16/17] i2c: nomadik: Remove busy check for transfers at suspend late Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58 ` [PATCH 17/17] i2c: nomadik: Fixup system suspend Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 15:58   ` Ulf Hansson
2014-02-04 18:49 ` [PATCH 00/17] amba: PM fixups for amba bus and some amba drivers Mark Brown
2014-02-04 18:49   ` Mark Brown
2014-02-04 18:49   ` Mark Brown
2014-02-10 10:25   ` Ulf Hansson
2014-02-10 10:25     ` Ulf Hansson
2014-02-10 10:25     ` 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=1391529538-21685-5-git-send-email-ulf.hansson@linaro.org \
    --to=ulf.hansson@linaro.org \
    --cc=broonie@kernel.org \
    --cc=chris@printf.net \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rubini@unipv.it \
    --cc=wsa@the-dreams.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.