In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.
To be able to remove these compatibility macros push the renaming into
this driver.
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/iio/adc/ad_sigma_delta.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index 7e2192870743..55442eddf57c 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -212,7 +212,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,
if (ret)
return ret;
- spi_bus_lock(sigma_delta->spi->master);
+ spi_bus_lock(sigma_delta->spi->controller);
sigma_delta->bus_locked = true;
sigma_delta->keep_cs_asserted = true;
reinit_completion(&sigma_delta->completion);
@@ -235,7 +235,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,
sigma_delta->keep_cs_asserted = false;
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
sigma_delta->bus_locked = false;
- spi_bus_unlock(sigma_delta->spi->master);
+ spi_bus_unlock(sigma_delta->spi->controller);
return ret;
}
@@ -287,7 +287,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
ad_sigma_delta_set_channel(sigma_delta, chan->address);
- spi_bus_lock(sigma_delta->spi->master);
+ spi_bus_lock(sigma_delta->spi->controller);
sigma_delta->bus_locked = true;
sigma_delta->keep_cs_asserted = true;
reinit_completion(&sigma_delta->completion);
@@ -322,7 +322,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
sigma_delta->keep_cs_asserted = false;
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
sigma_delta->bus_locked = false;
- spi_bus_unlock(sigma_delta->spi->master);
+ spi_bus_unlock(sigma_delta->spi->controller);
iio_device_release_direct_mode(indio_dev);
if (ret)
@@ -387,7 +387,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
sigma_delta->samples_buf = samples_buf;
- spi_bus_lock(sigma_delta->spi->master);
+ spi_bus_lock(sigma_delta->spi->controller);
sigma_delta->bus_locked = true;
sigma_delta->keep_cs_asserted = true;
@@ -401,7 +401,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
return 0;
err_unlock:
- spi_bus_unlock(sigma_delta->spi->master);
+ spi_bus_unlock(sigma_delta->spi->controller);
return ret;
}
@@ -426,7 +426,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev)
ad_sigma_delta_disable_all(sigma_delta);
sigma_delta->bus_locked = false;
- return spi_bus_unlock(sigma_delta->spi->master);
+ return spi_bus_unlock(sigma_delta->spi->controller);
}
static irqreturn_t ad_sd_trigger_handler(int irq, void *p)
--
2.43.0
On Wed, 2024-02-07 at 19:40 +0100, Uwe Kleine-König wrote:
> In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
> some functions and struct members were renamed. To not break all drivers
> compatibility macros were provided.
>
> To be able to remove these compatibility macros push the renaming into
> this driver.
>
> Acked-by: Jonathan Cameron <[email protected]>
> Signed-off-by: Uwe Kleine-König <[email protected]>
> ---
Acked-by: Nuno Sa <[email protected]>
> drivers/iio/adc/ad_sigma_delta.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/adc/ad_sigma_delta.c
> b/drivers/iio/adc/ad_sigma_delta.c
> index 7e2192870743..55442eddf57c 100644
> --- a/drivers/iio/adc/ad_sigma_delta.c
> +++ b/drivers/iio/adc/ad_sigma_delta.c
> @@ -212,7 +212,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,
> if (ret)
> return ret;
>
> - spi_bus_lock(sigma_delta->spi->master);
> + spi_bus_lock(sigma_delta->spi->controller);
> sigma_delta->bus_locked = true;
> sigma_delta->keep_cs_asserted = true;
> reinit_completion(&sigma_delta->completion);
> @@ -235,7 +235,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,
> sigma_delta->keep_cs_asserted = false;
> ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
> sigma_delta->bus_locked = false;
> - spi_bus_unlock(sigma_delta->spi->master);
> + spi_bus_unlock(sigma_delta->spi->controller);
>
> return ret;
> }
> @@ -287,7 +287,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev
> *indio_dev,
>
> ad_sigma_delta_set_channel(sigma_delta, chan->address);
>
> - spi_bus_lock(sigma_delta->spi->master);
> + spi_bus_lock(sigma_delta->spi->controller);
> sigma_delta->bus_locked = true;
> sigma_delta->keep_cs_asserted = true;
> reinit_completion(&sigma_delta->completion);
> @@ -322,7 +322,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev
> *indio_dev,
> sigma_delta->keep_cs_asserted = false;
> ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
> sigma_delta->bus_locked = false;
> - spi_bus_unlock(sigma_delta->spi->master);
> + spi_bus_unlock(sigma_delta->spi->controller);
> iio_device_release_direct_mode(indio_dev);
>
> if (ret)
> @@ -387,7 +387,7 @@ static int ad_sd_buffer_postenable(struct iio_dev
> *indio_dev)
>
> sigma_delta->samples_buf = samples_buf;
>
> - spi_bus_lock(sigma_delta->spi->master);
> + spi_bus_lock(sigma_delta->spi->controller);
> sigma_delta->bus_locked = true;
> sigma_delta->keep_cs_asserted = true;
>
> @@ -401,7 +401,7 @@ static int ad_sd_buffer_postenable(struct iio_dev
> *indio_dev)
> return 0;
>
> err_unlock:
> - spi_bus_unlock(sigma_delta->spi->master);
> + spi_bus_unlock(sigma_delta->spi->controller);
>
> return ret;
> }
> @@ -426,7 +426,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev
> *indio_dev)
>
> ad_sigma_delta_disable_all(sigma_delta);
> sigma_delta->bus_locked = false;
> - return spi_bus_unlock(sigma_delta->spi->master);
> + return spi_bus_unlock(sigma_delta->spi->controller);
> }
>
> static irqreturn_t ad_sd_trigger_handler(int irq, void *p)