> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > These new functions move the burden of removing unused code when > CONFIG_PM_SLEEP is not defined onto the compiler rather than requiring > the use of CONFIG_PM guards and similar. Acked-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20220220181522.541718-8-jic23@xxxxxxxxxx > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 10 ++++------ > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 2 +- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 2 +- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 2 +- > 4 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index 910397716833..9e4aa5c1c8d6 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -2291,7 +2291,7 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id, > } > EXPORT_SYMBOL(st_lsm6dsx_probe); > > -static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) > +static int st_lsm6dsx_suspend(struct device *dev) > { > struct st_lsm6dsx_hw *hw = dev_get_drvdata(dev); > struct st_lsm6dsx_sensor *sensor; > @@ -2330,7 +2330,7 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) > return err; > } > > -static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > +static int st_lsm6dsx_resume(struct device *dev) > { > struct st_lsm6dsx_hw *hw = dev_get_drvdata(dev); > struct st_lsm6dsx_sensor *sensor; > @@ -2366,10 +2366,8 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > return err; > } > > -const struct dev_pm_ops st_lsm6dsx_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(st_lsm6dsx_suspend, st_lsm6dsx_resume) > -}; > -EXPORT_SYMBOL(st_lsm6dsx_pm_ops); > +EXPORT_SIMPLE_DEV_PM_OPS(st_lsm6dsx_pm_ops, st_lsm6dsx_suspend, > + st_lsm6dsx_resume); > > MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi@xxxxxx>"); > MODULE_AUTHOR("Denis Ciocca <denis.ciocca@xxxxxx>"); > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > index 715fbdc8190e..5bd565b93a8c 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c > @@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(i2c, st_lsm6dsx_i2c_id_table); > static struct i2c_driver st_lsm6dsx_driver = { > .driver = { > .name = "st_lsm6dsx_i2c", > - .pm = &st_lsm6dsx_pm_ops, > + .pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops), > .of_match_table = st_lsm6dsx_i2c_of_match, > }, > .probe = st_lsm6dsx_i2c_probe, > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > index 35556cd04284..4df186499802 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > @@ -44,7 +44,7 @@ static int st_lsm6dsx_i3c_probe(struct i3c_device *i3cdev) > static struct i3c_driver st_lsm6dsx_driver = { > .driver = { > .name = "st_lsm6dsx_i3c", > - .pm = &st_lsm6dsx_pm_ops, > + .pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops), > }, > .probe = st_lsm6dsx_i3c_probe, > .id_table = st_lsm6dsx_i3c_ids, > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > index f5767cf76c1d..3a206fd4d92c 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c > @@ -134,7 +134,7 @@ MODULE_DEVICE_TABLE(spi, st_lsm6dsx_spi_id_table); > static struct spi_driver st_lsm6dsx_driver = { > .driver = { > .name = "st_lsm6dsx_spi", > - .pm = &st_lsm6dsx_pm_ops, > + .pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops), > .of_match_table = st_lsm6dsx_spi_of_match, > }, > .probe = st_lsm6dsx_spi_probe, > -- > 2.36.1 >
Attachment:
signature.asc
Description: PGP signature
