From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 1/7] mfd: tps65090: Fix ifdefs for suspend mode
Date: Mon, 7 May 2012 10:03:17 +0100 [thread overview]
Message-ID: <1336381403-7840-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
CONFIG_PM also covers runtime only PM.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
drivers/mfd/tps65090.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 47f802b..4d60556 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -323,7 +323,7 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int tps65090_i2c_suspend(struct i2c_client *client, pm_message_t state)
{
if (client->irq)
@@ -352,7 +352,7 @@ static struct i2c_driver tps65090_driver = {
},
.probe = tps65090_i2c_probe,
.remove = __devexit_p(tps65090_i2c_remove),
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
.suspend = tps65090_i2c_suspend,
.resume = tps65090_i2c_resume,
#endif
--
1.7.10
next reply other threads:[~2012-05-07 9:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 9:03 Mark Brown [this message]
2012-05-07 9:03 ` [PATCH 2/7] mfd: tps65090: Don't use I2C-specific suspend and resume operations Mark Brown
2012-05-07 9:03 ` [PATCH 3/7] mfd: tps65910: Fix section annotations Mark Brown
2012-05-07 9:03 ` [PATCH 4/7] mfd: wm831x: Fix register range passing for recent ARM updates Mark Brown
2012-05-07 9:03 ` [PATCH 5/7] mfd: wm8350: Convert physical I/O to regmap API Mark Brown
2012-05-07 9:03 ` [PATCH 6/7] mfd: wm8994: Read CUST_ID from the device Mark Brown
2012-05-07 9:03 ` [PATCH 7/7] mfd: wm8994: Convert to module_i2c_driver() Mark Brown
2012-05-07 9:33 ` [PATCH 1/7] mfd: tps65090: Fix ifdefs for suspend mode Samuel Ortiz
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=1336381403-7840-1-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/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
all inboxes | Powered by JetHome®