These were usually used before the conversion to devm_ functions, so that
the remove hook would be able to retrieve the pointer and do cleanups on
remove.
When the conversion happened, they should have been removed, but were
omitted.
Some drivers were copied from drivers that fit the criteria described
above. In any case, in order to prevent more drivers from being used as
example (and have spi_set_drvdata() needlessly set), this change removes it
from the IIO IMU group.
Signed-off-by: Alexandru Ardelean <[email protected]>
---
drivers/iio/imu/adis16400.c | 2 --
drivers/iio/imu/adis16460.c | 2 --
drivers/iio/imu/adis16475.c | 1 -
drivers/iio/imu/adis16480.c | 2 --
4 files changed, 7 deletions(-)
diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
index cb8d3ffab6fc..109b2360a54e 100644
--- a/drivers/iio/imu/adis16400.c
+++ b/drivers/iio/imu/adis16400.c
@@ -1164,8 +1164,6 @@ static int adis16400_probe(struct spi_device *spi)
return -ENOMEM;
st = iio_priv(indio_dev);
- /* this is only used for removal purposes */
- spi_set_drvdata(spi, indio_dev);
/* setup the industrialio driver allocated elements */
st->variant = &adis16400_chips[spi_get_device_id(spi)->driver_data];
diff --git a/drivers/iio/imu/adis16460.c b/drivers/iio/imu/adis16460.c
index 73bf45e859b8..068d98780383 100644
--- a/drivers/iio/imu/adis16460.c
+++ b/drivers/iio/imu/adis16460.c
@@ -388,8 +388,6 @@ static int adis16460_probe(struct spi_device *spi)
if (indio_dev == NULL)
return -ENOMEM;
- spi_set_drvdata(spi, indio_dev);
-
st = iio_priv(indio_dev);
st->chip_info = &adis16460_chip_info;
diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
index 5654c0c15426..90aec3c9dbcb 100644
--- a/drivers/iio/imu/adis16475.c
+++ b/drivers/iio/imu/adis16475.c
@@ -1329,7 +1329,6 @@ static int adis16475_probe(struct spi_device *spi)
return -ENOMEM;
st = iio_priv(indio_dev);
- spi_set_drvdata(spi, indio_dev);
st->info = device_get_match_data(&spi->dev);
if (!st->info)
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index f81b86690b76..c7dd1150780d 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -1279,8 +1279,6 @@ static int adis16480_probe(struct spi_device *spi)
if (indio_dev == NULL)
return -ENOMEM;
- spi_set_drvdata(spi, indio_dev);
-
st = iio_priv(indio_dev);
st->chip_info = &adis16480_chip_info[id->driver_data];
--
2.31.1
On Thu, 13 May 2021 15:25:12 +0300
Alexandru Ardelean <[email protected]> wrote:
> These were usually used before the conversion to devm_ functions, so that
> the remove hook would be able to retrieve the pointer and do cleanups on
> remove.
> When the conversion happened, they should have been removed, but were
> omitted.
>
> Some drivers were copied from drivers that fit the criteria described
> above. In any case, in order to prevent more drivers from being used as
> example (and have spi_set_drvdata() needlessly set), this change removes it
> from the IIO IMU group.
>
> Signed-off-by: Alexandru Ardelean <[email protected]>
Hohum. I missed this one due to an error in my colour coding scheme
that had it having dependencies. Oops.
Applied to the togreg branch of iio.git and pushed out as testing
for 0-day to poke at.
Thanks,
Jonathan
> ---
> drivers/iio/imu/adis16400.c | 2 --
> drivers/iio/imu/adis16460.c | 2 --
> drivers/iio/imu/adis16475.c | 1 -
> drivers/iio/imu/adis16480.c | 2 --
> 4 files changed, 7 deletions(-)
>
> diff --git a/drivers/iio/imu/adis16400.c b/drivers/iio/imu/adis16400.c
> index cb8d3ffab6fc..109b2360a54e 100644
> --- a/drivers/iio/imu/adis16400.c
> +++ b/drivers/iio/imu/adis16400.c
> @@ -1164,8 +1164,6 @@ static int adis16400_probe(struct spi_device *spi)
> return -ENOMEM;
>
> st = iio_priv(indio_dev);
> - /* this is only used for removal purposes */
> - spi_set_drvdata(spi, indio_dev);
>
> /* setup the industrialio driver allocated elements */
> st->variant = &adis16400_chips[spi_get_device_id(spi)->driver_data];
> diff --git a/drivers/iio/imu/adis16460.c b/drivers/iio/imu/adis16460.c
> index 73bf45e859b8..068d98780383 100644
> --- a/drivers/iio/imu/adis16460.c
> +++ b/drivers/iio/imu/adis16460.c
> @@ -388,8 +388,6 @@ static int adis16460_probe(struct spi_device *spi)
> if (indio_dev == NULL)
> return -ENOMEM;
>
> - spi_set_drvdata(spi, indio_dev);
> -
> st = iio_priv(indio_dev);
>
> st->chip_info = &adis16460_chip_info;
> diff --git a/drivers/iio/imu/adis16475.c b/drivers/iio/imu/adis16475.c
> index 5654c0c15426..90aec3c9dbcb 100644
> --- a/drivers/iio/imu/adis16475.c
> +++ b/drivers/iio/imu/adis16475.c
> @@ -1329,7 +1329,6 @@ static int adis16475_probe(struct spi_device *spi)
> return -ENOMEM;
>
> st = iio_priv(indio_dev);
> - spi_set_drvdata(spi, indio_dev);
>
> st->info = device_get_match_data(&spi->dev);
> if (!st->info)
> diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
> index f81b86690b76..c7dd1150780d 100644
> --- a/drivers/iio/imu/adis16480.c
> +++ b/drivers/iio/imu/adis16480.c
> @@ -1279,8 +1279,6 @@ static int adis16480_probe(struct spi_device *spi)
> if (indio_dev == NULL)
> return -ENOMEM;
>
> - spi_set_drvdata(spi, indio_dev);
> -
> st = iio_priv(indio_dev);
>
> st->chip_info = &adis16480_chip_info[id->driver_data];