Commit 5ad7f3c9 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:light:tsl4531: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc

Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based config guards.

Removing instances of this approach from IIO also stops them being
copied into new drivers.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-29-jic23@kernel.org
parent 854b6705
...@@ -215,7 +215,6 @@ static int tsl4531_remove(struct i2c_client *client) ...@@ -215,7 +215,6 @@ static int tsl4531_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int tsl4531_suspend(struct device *dev) static int tsl4531_suspend(struct device *dev)
{ {
return tsl4531_powerdown(to_i2c_client(dev)); return tsl4531_powerdown(to_i2c_client(dev));
...@@ -227,11 +226,8 @@ static int tsl4531_resume(struct device *dev) ...@@ -227,11 +226,8 @@ static int tsl4531_resume(struct device *dev)
TSL4531_MODE_NORMAL); TSL4531_MODE_NORMAL);
} }
static SIMPLE_DEV_PM_OPS(tsl4531_pm_ops, tsl4531_suspend, tsl4531_resume); static DEFINE_SIMPLE_DEV_PM_OPS(tsl4531_pm_ops, tsl4531_suspend,
#define TSL4531_PM_OPS (&tsl4531_pm_ops) tsl4531_resume);
#else
#define TSL4531_PM_OPS NULL
#endif
static const struct i2c_device_id tsl4531_id[] = { static const struct i2c_device_id tsl4531_id[] = {
{ "tsl4531", 0 }, { "tsl4531", 0 },
...@@ -242,7 +238,7 @@ MODULE_DEVICE_TABLE(i2c, tsl4531_id); ...@@ -242,7 +238,7 @@ MODULE_DEVICE_TABLE(i2c, tsl4531_id);
static struct i2c_driver tsl4531_driver = { static struct i2c_driver tsl4531_driver = {
.driver = { .driver = {
.name = TSL4531_DRV_NAME, .name = TSL4531_DRV_NAME,
.pm = TSL4531_PM_OPS, .pm = pm_sleep_ptr(&tsl4531_pm_ops),
}, },
.probe = tsl4531_probe, .probe = tsl4531_probe,
.remove = tsl4531_remove, .remove = tsl4531_remove,
......
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