hwmon: jc42: Simplify pm ops handling
PATCH 1/1 hwmon: jc42: Simplify pm ops handling
Use pm_sleep_ptr/DEFINE_SIMPLE_DEV_PM_OPS to simplify the code.
Note: Apparently conditional compiling based on CONFIG_PM wasn't optimal, it should have been CONFIG_PM_SLEEP.
--- drivers/hwmon/jc42.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/hwmon/jc42.c +2 -12
@@ -570,8 +570,6 @@ static void jc42_remove(struct i2c_client *client) } } -#ifdef CONFIG_PM -static int jc42_suspend (struct device *dev) {struct jc42_data *data =dev_get_drvdata (dev);
@@ -598,15 +596,7 @@ static int jc42_resume(struct device *dev)return regcache_sync (data->regmap); } -static const struct dev_pm_ops jc42_dev_pm_ops = { - .suspend = jc42_suspend, - .resume = jc42_resume, -}; - -#define JC42_DEV_PM_OPS (&jc42_dev_pm_ops) -#else -#define JC42_DEV_PM_OPS NULL -#endif /* CONFIG_PM */ +static DEFINE_SIMPLE_DEV_PM_OPS(jc42_pm_ops, jc42_suspend, jc42_resume);static const struct i2c_device_id jc42_id[] = { {"jc42" ,0 },
@@ -626,7 +616,7 @@ static struct i2c_driver jc42_driver = { .class = I2C_CLASS_SPD | I2C_CLASS_HWMON, .driver = { .name = "jc42", - .pm = JC42_DEV_PM_OPS, + .pm = pm_sleep_ptr(&jc42_pm_ops), .of_match_table = of_match_ptr(jc42_of_ids), }, .probe = jc42_probe,
Signature · 1 line
2.42.1
Guenter Roeck
maintainerQuoted 4 lines · Heiner Kallweit
Use pm_sleep_ptr/DEFINE_SIMPLE_DEV_PM_OPS to simplify the code.
Note: Apparently conditional compiling based on
CONFIG_PMwasn't optimal, it should have beenCONFIG_PM_SLEEP.
Maybe that is apparent to you, but not to me, and I assume it won't be apparent to others either. That warrants a real explanation, not just "apparently".
Guenter
Quoted 10 lines · Guenter Roeck
Quoted 4 lines · Heiner Kallweit
Use pm_sleep_ptr/DEFINE_SIMPLE_DEV_PM_OPS to simplify the code.
Note: Apparently conditional compiling based on
CONFIG_PMwasn't optimal, it should have beenCONFIG_PM_SLEEP.Maybe that is apparent to you, but not to me, and I assume it won't be apparent to others either. That warrants a real explanation, not just "apparently".
See e.g. pm_generic_suspend(), it's NULL if CONFIG_PM_SLEEP isn't defined. Another hint is the following from pm.h:
#ifdef CONFIG_PM_SLEEP
#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)
#else
#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) #endif
CONFIG_PM_SLEEP implies CONFIG_PM, but we can have a setup where CONFIG_PM is defined but CONFIG_PM_SLEEP is not. In this case jc42_suspend/resume would be defined but not used by the PM core.
Quoted 1 line
Guenter
Heiner