Commit 1efe2b25 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Guenter Roeck

hwmon: (tmp108) Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

These newer PM macros allow the compiler to see what code it can remove
if !CONFIG_PM_SLEEP. This allows the removal of __maybe_unused markings
whilst achieving the same result.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20220925172759.3573439-17-jic23@kernel.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent a158b4ea
...@@ -390,7 +390,7 @@ static int tmp108_probe(struct i2c_client *client) ...@@ -390,7 +390,7 @@ static int tmp108_probe(struct i2c_client *client)
return PTR_ERR_OR_ZERO(hwmon_dev); return PTR_ERR_OR_ZERO(hwmon_dev);
} }
static int __maybe_unused tmp108_suspend(struct device *dev) static int tmp108_suspend(struct device *dev)
{ {
struct tmp108 *tmp108 = dev_get_drvdata(dev); struct tmp108 *tmp108 = dev_get_drvdata(dev);
...@@ -398,7 +398,7 @@ static int __maybe_unused tmp108_suspend(struct device *dev) ...@@ -398,7 +398,7 @@ static int __maybe_unused tmp108_suspend(struct device *dev)
TMP108_CONF_MODE_MASK, TMP108_MODE_SHUTDOWN); TMP108_CONF_MODE_MASK, TMP108_MODE_SHUTDOWN);
} }
static int __maybe_unused tmp108_resume(struct device *dev) static int tmp108_resume(struct device *dev)
{ {
struct tmp108 *tmp108 = dev_get_drvdata(dev); struct tmp108 *tmp108 = dev_get_drvdata(dev);
int err; int err;
...@@ -410,7 +410,7 @@ static int __maybe_unused tmp108_resume(struct device *dev) ...@@ -410,7 +410,7 @@ static int __maybe_unused tmp108_resume(struct device *dev)
return err; return err;
} }
static SIMPLE_DEV_PM_OPS(tmp108_dev_pm_ops, tmp108_suspend, tmp108_resume); static DEFINE_SIMPLE_DEV_PM_OPS(tmp108_dev_pm_ops, tmp108_suspend, tmp108_resume);
static const struct i2c_device_id tmp108_i2c_ids[] = { static const struct i2c_device_id tmp108_i2c_ids[] = {
{ "tmp108", 0 }, { "tmp108", 0 },
...@@ -429,7 +429,7 @@ MODULE_DEVICE_TABLE(of, tmp108_of_ids); ...@@ -429,7 +429,7 @@ MODULE_DEVICE_TABLE(of, tmp108_of_ids);
static struct i2c_driver tmp108_driver = { static struct i2c_driver tmp108_driver = {
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = &tmp108_dev_pm_ops, .pm = pm_sleep_ptr(&tmp108_dev_pm_ops),
.of_match_table = of_match_ptr(tmp108_of_ids), .of_match_table = of_match_ptr(tmp108_of_ids),
}, },
.probe_new = tmp108_probe, .probe_new = tmp108_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment