On Fri, 22 May 2020 10:08:01 +0300 Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> wrote: > We may want to get rid of the iio_priv_to_dev() helper. That's a bit > uncertain at this point. The reason is that we will hide some of the > members of the iio_dev structure (to prevent drivers from accessing them > directly), and that will also mean hiding the implementation of the > iio_priv_to_dev() helper inside the IIO core. > > Hiding the implementation of iio_priv_to_dev() implies that some fast-paths > may not be fast anymore, so a general idea is to try to get rid of the > iio_priv_to_dev() altogether. > > For this driver, it implies passing the IIO device on the i2c client > private data. The implementation of iio_priv() will not be affected by the > rework/hiding of iio_priv_to_dev(). > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> Applied. Thanks, J > --- > drivers/iio/light/tsl2563.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c > index 27a5c28aac7f..2987a7a79a97 100644 > --- a/drivers/iio/light/tsl2563.c > +++ b/drivers/iio/light/tsl2563.c > @@ -713,7 +713,7 @@ static int tsl2563_probe(struct i2c_client *client, > > chip = iio_priv(indio_dev); > > - i2c_set_clientdata(client, chip); > + i2c_set_clientdata(client, indio_dev); > chip->client = client; > > err = tsl2563_detect(chip); > @@ -797,8 +797,8 @@ static int tsl2563_probe(struct i2c_client *client, > > static int tsl2563_remove(struct i2c_client *client) > { > - struct tsl2563_chip *chip = i2c_get_clientdata(client); > - struct iio_dev *indio_dev = iio_priv_to_dev(chip); > + struct iio_dev *indio_dev = i2c_get_clientdata(client); > + struct tsl2563_chip *chip = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > if (!chip->int_enabled) > @@ -816,7 +816,8 @@ static int tsl2563_remove(struct i2c_client *client) > #ifdef CONFIG_PM_SLEEP > static int tsl2563_suspend(struct device *dev) > { > - struct tsl2563_chip *chip = i2c_get_clientdata(to_i2c_client(dev)); > + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); > + struct tsl2563_chip *chip = iio_priv(indio_dev); > int ret; > > mutex_lock(&chip->lock); > @@ -834,7 +835,8 @@ static int tsl2563_suspend(struct device *dev) > > static int tsl2563_resume(struct device *dev) > { > - struct tsl2563_chip *chip = i2c_get_clientdata(to_i2c_client(dev)); > + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); > + struct tsl2563_chip *chip = iio_priv(indio_dev); > int ret; > > mutex_lock(&chip->lock);