From: Guenter Roeck <linux@roeck-us.net>
To: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org,
Jean Delvare <khali@linux-fr.org>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Jingoo Han <jg1.han@samsung.com>,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 2/3] hwmon: (tmp102) Convert to use __pm instead of #ifdef CONFIG_PM
Date: Thu, 9 May 2013 10:09:50 -0700 [thread overview]
Message-ID: <1368119391-13837-3-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1368119391-13837-1-git-send-email-linux@roeck-us.net>
With this change, code only needed is power management is active still
compiles if it is disabled, but does not consume space in the object file.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/hwmon/tmp102.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 523dd89..8e5d267 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -236,8 +236,7 @@ static int tmp102_remove(struct i2c_client *client)
return 0;
}
-#ifdef CONFIG_PM
-static int tmp102_suspend(struct device *dev)
+static int __pm tmp102_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
int config;
@@ -250,7 +249,7 @@ static int tmp102_suspend(struct device *dev)
return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config);
}
-static int tmp102_resume(struct device *dev)
+static int __pm tmp102_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
int config;
@@ -263,16 +262,11 @@ static int tmp102_resume(struct device *dev)
return i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, config);
}
-static const struct dev_pm_ops tmp102_dev_pm_ops = {
+static const struct dev_pm_ops __pm tmp102_dev_pm_ops = {
.suspend = tmp102_suspend,
.resume = tmp102_resume,
};
-#define TMP102_DEV_PM_OPS (&tmp102_dev_pm_ops)
-#else
-#define TMP102_DEV_PM_OPS NULL
-#endif /* CONFIG_PM */
-
static const struct i2c_device_id tmp102_id[] = {
{ "tmp102", 0 },
{ }
@@ -281,7 +275,7 @@ MODULE_DEVICE_TABLE(i2c, tmp102_id);
static struct i2c_driver tmp102_driver = {
.driver.name = DRIVER_NAME,
- .driver.pm = TMP102_DEV_PM_OPS,
+ .driver.pm = pm_ops_ptr(&tmp102_dev_pm_ops),
.probe = tmp102_probe,
.remove = tmp102_remove,
.id_table = tmp102_id,
--
1.7.9.7
next prev parent reply other threads:[~2013-05-09 17:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 17:09 [PATCH 0/3] pm: Introduce __pm to mark power management code Guenter Roeck
2013-05-09 17:09 ` [PATCH 1/3] pm: Introduce __pm to mark power management functions and data Guenter Roeck
2013-05-09 17:09 ` Guenter Roeck [this message]
2013-05-09 17:09 ` [PATCH 3/3] hwmon: (max6639) Convert to use __pm instead of #ifdef CONFIG_PM_SLEEP Guenter Roeck
2013-05-10 10:54 ` [PATCH 0/3] pm: Introduce __pm to mark power management code Pavel Machek
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=1368119391-13837-3-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jg1.han@samsung.com \
--cc=khali@linux-fr.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
--cc=pavel@ucw.cz \
/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