Commit 77563092 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Guenter Roeck

hwmon: (max6639) 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 #ifdef guards whilst
achieving the same result.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Roland Stigge <stigge@antcom.de>
Link: https://lore.kernel.org/r/20220925172759.3573439-12-jic23@kernel.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5ce951ab
...@@ -571,7 +571,6 @@ static int max6639_probe(struct i2c_client *client) ...@@ -571,7 +571,6 @@ static int max6639_probe(struct i2c_client *client)
return PTR_ERR_OR_ZERO(hwmon_dev); return PTR_ERR_OR_ZERO(hwmon_dev);
} }
#ifdef CONFIG_PM_SLEEP
static int max6639_suspend(struct device *dev) static int max6639_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -609,7 +608,6 @@ static int max6639_resume(struct device *dev) ...@@ -609,7 +608,6 @@ static int max6639_resume(struct device *dev)
return i2c_smbus_write_byte_data(client, return i2c_smbus_write_byte_data(client,
MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY); MAX6639_REG_GCONFIG, ret & ~MAX6639_GCONFIG_STANDBY);
} }
#endif /* CONFIG_PM_SLEEP */
static const struct i2c_device_id max6639_id[] = { static const struct i2c_device_id max6639_id[] = {
{"max6639", 0}, {"max6639", 0},
...@@ -618,13 +616,13 @@ static const struct i2c_device_id max6639_id[] = { ...@@ -618,13 +616,13 @@ static const struct i2c_device_id max6639_id[] = {
MODULE_DEVICE_TABLE(i2c, max6639_id); MODULE_DEVICE_TABLE(i2c, max6639_id);
static SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume); static DEFINE_SIMPLE_DEV_PM_OPS(max6639_pm_ops, max6639_suspend, max6639_resume);
static struct i2c_driver max6639_driver = { static struct i2c_driver max6639_driver = {
.class = I2C_CLASS_HWMON, .class = I2C_CLASS_HWMON,
.driver = { .driver = {
.name = "max6639", .name = "max6639",
.pm = &max6639_pm_ops, .pm = pm_sleep_ptr(&max6639_pm_ops),
}, },
.probe_new = max6639_probe, .probe_new = max6639_probe,
.id_table = max6639_id, .id_table = max6639_id,
......
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