Message ID | 20220621202719.13644-20-jic23@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | IIO: switch easy cases to new simpler PM related macros. | expand |
both patches 19 and 20: Reviewed-by: David Heidelberg <david@ixit.cz> On 21/06/2022 22:27, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Using these newer macros allows the compiler to remove the unused > structure and functions when !CONFIG_PM_SLEEP + removes the need to > mark pm functions __maybe_unused. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: David Heidelberg <david@ixit.cz> > --- > drivers/iio/light/al3010.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c > index b4e9924094cd..ce5363845b22 100644 > --- a/drivers/iio/light/al3010.c > +++ b/drivers/iio/light/al3010.c > @@ -200,17 +200,17 @@ static int al3010_probe(struct i2c_client *client, > return devm_iio_device_register(&client->dev, indio_dev); > } > > -static int __maybe_unused al3010_suspend(struct device *dev) > +static int al3010_suspend(struct device *dev) > { > return al3010_set_pwr(to_i2c_client(dev), false); > } > > -static int __maybe_unused al3010_resume(struct device *dev) > +static int al3010_resume(struct device *dev) > { > return al3010_set_pwr(to_i2c_client(dev), true); > } > > -static SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume); > > static const struct i2c_device_id al3010_id[] = { > {"al3010", }, > @@ -228,7 +228,7 @@ static struct i2c_driver al3010_driver = { > .driver = { > .name = AL3010_DRV_NAME, > .of_match_table = al3010_of_match, > - .pm = &al3010_pm_ops, > + .pm = pm_sleep_ptr(&al3010_pm_ops), > }, > .probe = al3010_probe, > .id_table = al3010_id,
diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c index b4e9924094cd..ce5363845b22 100644 --- a/drivers/iio/light/al3010.c +++ b/drivers/iio/light/al3010.c @@ -200,17 +200,17 @@ static int al3010_probe(struct i2c_client *client, return devm_iio_device_register(&client->dev, indio_dev); } -static int __maybe_unused al3010_suspend(struct device *dev) +static int al3010_suspend(struct device *dev) { return al3010_set_pwr(to_i2c_client(dev), false); } -static int __maybe_unused al3010_resume(struct device *dev) +static int al3010_resume(struct device *dev) { return al3010_set_pwr(to_i2c_client(dev), true); } -static SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume); static const struct i2c_device_id al3010_id[] = { {"al3010", }, @@ -228,7 +228,7 @@ static struct i2c_driver al3010_driver = { .driver = { .name = AL3010_DRV_NAME, .of_match_table = al3010_of_match, - .pm = &al3010_pm_ops, + .pm = pm_sleep_ptr(&al3010_pm_ops), }, .probe = al3010_probe, .id_table = al3010_id,