From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Linux PM list <linux-pm@vger.kernel.org>,
Linus Walleij <linus.walleij@stericsson.com>,
linux-i2c@vger.kernel.org, Sonic Zhang <sonic.zhang@analog.com>,
Jean Delvare <khali@linux-fr.org>,
Ben Dooks <ben-linux@fluff.org>,
Wolfram Sang <w.sang@pengutronix.de>,
Peter Korsgaard <jacmet@sunsite.dk>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
Vitaly Wool <vitalywool@gmail.com>,
Colin Cross <ccross@android.com>,
Stephen Warren <swarren@wwwdotorg.org>
Subject: [PATCH 5/7] i2c-puv3: Use struct dev_pm_ops for power management
Date: Wed, 11 Jul 2012 21:25:55 +0200 [thread overview]
Message-ID: <201207112125.55418.rjw@sisk.pl> (raw)
In-Reply-To: <201207112121.11046.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Make the PKUnity-v3 SoC I2C controller driver define its suspend
callback through a struct dev_pm_ops object rather than by using
a legacy PM hook in struct platform_driver. The empty resume
callback is not necessary, so remove it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/i2c/busses/i2c-puv3.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
Index: linux/drivers/i2c/busses/i2c-puv3.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-puv3.c
+++ linux/drivers/i2c/busses/i2c-puv3.c
@@ -254,7 +254,7 @@ static int __devexit puv3_i2c_remove(str
}
#ifdef CONFIG_PM
-static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t state)
+static int puv3_i2c_suspend(struct device *dev)
{
int poll_count;
/* Disable the IIC */
@@ -267,23 +267,20 @@ static int puv3_i2c_suspend(struct platf
return 0;
}
-static int puv3_i2c_resume(struct platform_device *dev)
-{
- return 0 ;
-}
+static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
+#define PUV3_I2C_PM (&puv3_i2c_pm)
+
#else
-#define puv3_i2c_suspend NULL
-#define puv3_i2c_resume NULL
+#define PUV3_I2C_PM NULL
#endif
static struct platform_driver puv3_i2c_driver = {
.probe = puv3_i2c_probe,
.remove = __devexit_p(puv3_i2c_remove),
- .suspend = puv3_i2c_suspend,
- .resume = puv3_i2c_resume,
.driver = {
.name = "PKUnity-v3-I2C",
.owner = THIS_MODULE,
+ .pm = PUV3_I2C_PM,
}
};
next prev parent reply other threads:[~2012-07-11 19:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 19:21 [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Rafael J. Wysocki
2012-07-11 19:22 ` [PATCH 1/7] i2c-at91: Use struct dev_pm_ops for power management Rafael J. Wysocki
2012-07-11 19:23 ` [PATCH 2/7] i2c-bfin-twi: " Rafael J. Wysocki
2012-07-12 2:51 ` Zhang, Sonic
2012-07-11 19:24 ` [PATCH 3/7] i2c-ocores: " Rafael J. Wysocki
2012-07-11 19:25 ` Rafael J. Wysocki [this message]
2012-07-12 3:24 ` [PATCH 5/7] i2c-puv3: " guanxuetao
2012-07-11 19:26 ` [PATCH 6/7] i2c-stu300: " Rafael J. Wysocki
[not found] ` <201207112126.36412.rjw-KKrjLPT3xs0@public.gmane.org>
2012-07-11 21:56 ` Linus Walleij
2012-07-11 19:27 ` [PATCH 7/7] i2c-tegra: " Rafael J. Wysocki
[not found] ` <201207112121.11046.rjw-KKrjLPT3xs0@public.gmane.org>
2012-07-11 19:25 ` [PATCH 4/7] i2c-pnx: " Rafael J. Wysocki
2012-07-12 6:00 ` [PATCH 0/7] PM / I2C: Convert platform I2C drivers to PM handling based on struct dev_pm_ops Laxman Dewangan
2012-07-12 10:09 ` Wolfram Sang
2012-07-12 10:17 ` Rafael J. Wysocki
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=201207112125.55418.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=ben-linux@fluff.org \
--cc=ccross@android.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=jacmet@sunsite.dk \
--cc=khali@linux-fr.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sonic.zhang@analog.com \
--cc=swarren@wwwdotorg.org \
--cc=vitalywool@gmail.com \
--cc=w.sang@pengutronix.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 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).