From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Magnus Damm <magnus.damm@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>, Arnd Bergmann <arnd@arndb.de>,
linux-sh@vger.kernel.org, linux-input@vger.kernel.org
Subject: [PATCH] Input: st1232 - switch to using SIMPLE_DEV_PM_OPS
Date: Sat, 31 Mar 2012 06:18:02 +0000 [thread overview]
Message-ID: <20120331061801.GA20441@core.coreip.homeip.net> (raw)
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
Just compiled, not tested...
drivers/input/touchscreen/st1232.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index e22e27e..a9be39f 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -218,7 +218,7 @@ static int __devexit st1232_ts_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int st1232_ts_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
@@ -243,12 +243,11 @@ static int st1232_ts_resume(struct device *dev)
return 0;
}
-static const struct dev_pm_ops st1232_ts_pm_ops = {
- .suspend = st1232_ts_suspend,
- .resume = st1232_ts_resume,
-};
#endif
+static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops,
+ st1232_ts_suspend, st1232_ts_resume);
+
static const struct i2c_device_id st1232_ts_id[] = {
{ ST1232_TS_NAME, 0 },
{ }
@@ -269,9 +268,7 @@ static struct i2c_driver st1232_ts_driver = {
.name = ST1232_TS_NAME,
.owner = THIS_MODULE,
.of_match_table = st1232_ts_dt_ids,
-#ifdef CONFIG_PM
.pm = &st1232_ts_pm_ops,
-#endif
},
};
--
1.7.7.6
--
Dmitry
next reply other threads:[~2012-03-31 6:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-31 6:18 Dmitry Torokhov [this message]
2012-04-01 5:58 ` [PATCH] Input: st1232 - switch to using SIMPLE_DEV_PM_OPS Rafael J. Wysocki
2012-04-01 23:28 ` Simon Horman
2012-04-02 0:41 ` Dmitry Torokhov
2012-04-02 5:03 ` Simon Horman
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=20120331061801.GA20441@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-input@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=rjw@sisk.pl \
/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