| Message ID | 20200211191201.1049902-6-david@ixit.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: light: AL3010 introduction | expand |
On Tue, 11 Feb 2020 20:11:59 +0100 David Heidelberg <david@ixit.cz> wrote: > AL3320a is fairly simple chip, so for suspend is enough to disable and > later enable it again. > > Signed-off-by: David Heidelberg <david@ixit.cz> Applied with a small tweak mentioned below. Thanks, Jonathan > --- > drivers/iio/light/al3320a.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c > index 89b935b4fe9e..affa4c6c199a 100644 > --- a/drivers/iio/light/al3320a.c > +++ b/drivers/iio/light/al3320a.c > @@ -7,6 +7,9 @@ > * IIO driver for AL3320A (7-bit I2C slave address 0x1C). > * > * TODO: interrupt support, thresholds > + * When the driver will get support for interrupt handling, then interrupt > + * will need to be disabled before turning sensor OFF in order to avoid > + * potential races with the interrupt handling. > */ > > #include <linux/bitfield.h> > @@ -78,13 +81,18 @@ static const struct attribute_group al3320a_attribute_group = { > .attrs = al3320a_attributes, > }; > > +static int al3320a_set_pwr(struct i2c_client *client, bool pwr) > +{ > + u8 val = pwr ? AL3320A_CONFIG_ENABLE : AL3320A_CONFIG_DISABLE; > + return i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, val); > +} > + > static int al3320a_init(struct al3320a_data *data) > { > int ret; > > - /* power on */ > - ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, > - AL3320A_CONFIG_ENABLE); > + ret = al3320a_set_pwr(data->client, true); > + > if (ret < 0) > return ret; > > @@ -203,10 +211,21 @@ static int al3320a_probe(struct i2c_client *client, > > static int al3320a_remove(struct i2c_client *client) > { > - return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, > - AL3320A_CONFIG_DISABLE); > + return al3320a_set_pwr(client, false); > } > > +static int __maybe_unused al3320a_suspend(struct device *dev) > +{ > + return al3320a_set_pwr(to_i2c_client(dev), false); > +} > + > +static int __maybe_unused al3320a_resume(struct device *dev) > +{ > + return al3320a_set_pwr(to_i2c_client(dev), true); > +} > + > +SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend, al3320a_resume); Build test showed this is missing a static. Added. > + > static const struct i2c_device_id al3320a_id[] = { > {"al3320a", 0}, > {} > @@ -216,6 +235,7 @@ MODULE_DEVICE_TABLE(i2c, al3320a_id); > static struct i2c_driver al3320a_driver = { > .driver = { > .name = AL3320A_DRV_NAME, > + .pm = &al3320a_pm_ops, > }, > .probe = al3320a_probe, > .remove = al3320a_remove,
On Tue, 11 Feb 2020 20:11:59 +0100 David Heidelberg <david@ixit.cz> wrote: > AL3320a is fairly simple chip, so for suspend is enough to disable and > later enable it again. > > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > drivers/iio/light/al3320a.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c > index 89b935b4fe9e..affa4c6c199a 100644 > --- a/drivers/iio/light/al3320a.c > +++ b/drivers/iio/light/al3320a.c > @@ -7,6 +7,9 @@ > * IIO driver for AL3320A (7-bit I2C slave address 0x1C). > * > * TODO: interrupt support, thresholds > + * When the driver will get support for interrupt handling, then interrupt > + * will need to be disabled before turning sensor OFF in order to avoid > + * potential races with the interrupt handling. > */ > > #include <linux/bitfield.h> > @@ -78,13 +81,18 @@ static const struct attribute_group al3320a_attribute_group = { > .attrs = al3320a_attributes, > }; > > +static int al3320a_set_pwr(struct i2c_client *client, bool pwr) > +{ > + u8 val = pwr ? AL3320A_CONFIG_ENABLE : AL3320A_CONFIG_DISABLE; > + return i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, val); > +} > + > static int al3320a_init(struct al3320a_data *data) > { > int ret; > > - /* power on */ > - ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, > - AL3320A_CONFIG_ENABLE); > + ret = al3320a_set_pwr(data->client, true); data doesn't exist. I've fixed up this as well, but please take a quick look. > + > if (ret < 0) > return ret; > > @@ -203,10 +211,21 @@ static int al3320a_probe(struct i2c_client *client, > > static int al3320a_remove(struct i2c_client *client) > { > - return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, > - AL3320A_CONFIG_DISABLE); > + return al3320a_set_pwr(client, false); > } > > +static int __maybe_unused al3320a_suspend(struct device *dev) > +{ > + return al3320a_set_pwr(to_i2c_client(dev), false); > +} > + > +static int __maybe_unused al3320a_resume(struct device *dev) > +{ > + return al3320a_set_pwr(to_i2c_client(dev), true); > +} > + > +SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend, al3320a_resume); > + > static const struct i2c_device_id al3320a_id[] = { > {"al3320a", 0}, > {} > @@ -216,6 +235,7 @@ MODULE_DEVICE_TABLE(i2c, al3320a_id); > static struct i2c_driver al3320a_driver = { > .driver = { > .name = AL3320A_DRV_NAME, > + .pm = &al3320a_pm_ops, > }, > .probe = al3320a_probe, > .remove = al3320a_remove,
On Sat, Feb 15, 2020 at 17:15, Jonathan Cameron <jic23@kernel.org>
wrote:
> SIMPLE_DEV_PM_OPS
Hello Jonathan,
sorry about al3320a, I didn't compile test it :(
Missing static for SIMPLE_DEV_PM_OPS is also valid for AL3010.
Sorry for inconvience.
David
On Sat, 15 Feb 2020 18:34:12 +0100 David Heidelberg <david@ixit.cz> wrote: > On Sat, Feb 15, 2020 at 17:15, Jonathan Cameron <jic23@kernel.org> > wrote: > > SIMPLE_DEV_PM_OPS > > Hello Jonathan, > > sorry about al3320a, I didn't compile test it :( > > Missing static for SIMPLE_DEV_PM_OPS is also valid for AL3010. Yup :) Got that one as well. Jonathan > > Sorry for inconvience. > > David > > >
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c index 89b935b4fe9e..affa4c6c199a 100644 --- a/drivers/iio/light/al3320a.c +++ b/drivers/iio/light/al3320a.c @@ -7,6 +7,9 @@ * IIO driver for AL3320A (7-bit I2C slave address 0x1C). * * TODO: interrupt support, thresholds + * When the driver will get support for interrupt handling, then interrupt + * will need to be disabled before turning sensor OFF in order to avoid + * potential races with the interrupt handling. */ #include <linux/bitfield.h> @@ -78,13 +81,18 @@ static const struct attribute_group al3320a_attribute_group = { .attrs = al3320a_attributes, }; +static int al3320a_set_pwr(struct i2c_client *client, bool pwr) +{ + u8 val = pwr ? AL3320A_CONFIG_ENABLE : AL3320A_CONFIG_DISABLE; + return i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, val); +} + static int al3320a_init(struct al3320a_data *data) { int ret; - /* power on */ - ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, - AL3320A_CONFIG_ENABLE); + ret = al3320a_set_pwr(data->client, true); + if (ret < 0) return ret; @@ -203,10 +211,21 @@ static int al3320a_probe(struct i2c_client *client, static int al3320a_remove(struct i2c_client *client) { - return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, - AL3320A_CONFIG_DISABLE); + return al3320a_set_pwr(client, false); } +static int __maybe_unused al3320a_suspend(struct device *dev) +{ + return al3320a_set_pwr(to_i2c_client(dev), false); +} + +static int __maybe_unused al3320a_resume(struct device *dev) +{ + return al3320a_set_pwr(to_i2c_client(dev), true); +} + +SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend, al3320a_resume); + static const struct i2c_device_id al3320a_id[] = { {"al3320a", 0}, {} @@ -216,6 +235,7 @@ MODULE_DEVICE_TABLE(i2c, al3320a_id); static struct i2c_driver al3320a_driver = { .driver = { .name = AL3320A_DRV_NAME, + .pm = &al3320a_pm_ops, }, .probe = al3320a_probe, .remove = al3320a_remove,
AL3320a is fairly simple chip, so for suspend is enough to disable and later enable it again. Signed-off-by: David Heidelberg <david@ixit.cz> --- drivers/iio/light/al3320a.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)