Commit 195b8b24 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:accel:bma180: 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-40-jic23@kernel.org
parent c1d24fac
...@@ -1065,7 +1065,6 @@ static int bma180_remove(struct i2c_client *client) ...@@ -1065,7 +1065,6 @@ static int bma180_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int bma180_suspend(struct device *dev) static int bma180_suspend(struct device *dev)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
...@@ -1092,11 +1091,7 @@ static int bma180_resume(struct device *dev) ...@@ -1092,11 +1091,7 @@ static int bma180_resume(struct device *dev)
return ret; return ret;
} }
static SIMPLE_DEV_PM_OPS(bma180_pm_ops, bma180_suspend, bma180_resume); static DEFINE_SIMPLE_DEV_PM_OPS(bma180_pm_ops, bma180_suspend, bma180_resume);
#define BMA180_PM_OPS (&bma180_pm_ops)
#else
#define BMA180_PM_OPS NULL
#endif
static const struct i2c_device_id bma180_ids[] = { static const struct i2c_device_id bma180_ids[] = {
{ "bma023", BMA023 }, { "bma023", BMA023 },
...@@ -1137,7 +1132,7 @@ MODULE_DEVICE_TABLE(of, bma180_of_match); ...@@ -1137,7 +1132,7 @@ MODULE_DEVICE_TABLE(of, bma180_of_match);
static struct i2c_driver bma180_driver = { static struct i2c_driver bma180_driver = {
.driver = { .driver = {
.name = "bma180", .name = "bma180",
.pm = BMA180_PM_OPS, .pm = pm_sleep_ptr(&bma180_pm_ops),
.of_match_table = bma180_of_match, .of_match_table = bma180_of_match,
}, },
.probe = bma180_probe, .probe = bma180_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