Received-SPF: pass (google.com: domain of linux-kernel+bounces-57589-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <a9ddd254d985e5e9e29466199ee45a9733d4043a.camel@gmail.com>
Subject: Re: [PATCH v3 03/32] iio: adc: ad_sigma_delta: Follow renaming of
 SPI "master" to "controller"
From: Nuno =?ISO-8859-1?Q?S=E1?= <noname.nuno@gmail.com>
To: Uwe =?ISO-8859-1?Q?Kleine-K=F6nig?= <u.kleine-koenig@pengutronix.de>, 
	Mark Brown <broonie@kernel.org>
Cc: kernel@pengutronix.de, Lars-Peter Clausen <lars@metafoo.de>, Michael
 Hennerich <Michael.Hennerich@analog.com>, Jonathan Cameron
 <jic23@kernel.org>,  linux-iio@vger.kernel.org,
 linux-kernel@vger.kernel.org, Jonathan Cameron <Jonathan.Cameron@huawei.com>
Date: Thu, 08 Feb 2024 09:14:02 +0100
In-Reply-To: <de866d09c80c89816df62602ba4ba8ba30e9971f.1707324794.git.u.kleine-koenig@pengutronix.de>
References: <cover.1707324793.git.u.kleine-koenig@pengutronix.de>
	 <de866d09c80c89816df62602ba4ba8ba30e9971f.1707324794.git.u.kleine-koenig@pengutronix.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.3 
Precedence: bulk
MIME-Version: 1.0

On Wed, 2024-02-07 at 19:40 +0100, Uwe Kleine-K=C3=B6nig 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.
>=20
> To be able to remove these compatibility macros push the renaming into
> this driver.
>=20
> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Uwe Kleine-K=C3=B6nig <u.kleine-koenig@pengutronix.de>
> ---

Acked-by: Nuno Sa <nuno.sa@analog.com>

> =C2=A0drivers/iio/adc/ad_sigma_delta.c | 14 +++++++-------
> =C2=A01 file changed, 7 insertions(+), 7 deletions(-)
>=20
> 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_delt=
a,
> =C2=A0	if (ret)
> =C2=A0		return ret;
> =C2=A0
> -	spi_bus_lock(sigma_delta->spi->master);
> +	spi_bus_lock(sigma_delta->spi->controller);
> =C2=A0	sigma_delta->bus_locked =3D true;
> =C2=A0	sigma_delta->keep_cs_asserted =3D true;
> =C2=A0	reinit_completion(&sigma_delta->completion);
> @@ -235,7 +235,7 @@ int ad_sd_calibrate(struct ad_sigma_delta *sigma_delt=
a,
> =C2=A0	sigma_delta->keep_cs_asserted =3D false;
> =C2=A0	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
> =C2=A0	sigma_delta->bus_locked =3D false;
> -	spi_bus_unlock(sigma_delta->spi->master);
> +	spi_bus_unlock(sigma_delta->spi->controller);
> =C2=A0
> =C2=A0	return ret;
> =C2=A0}
> @@ -287,7 +287,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev
> *indio_dev,
> =C2=A0
> =C2=A0	ad_sigma_delta_set_channel(sigma_delta, chan->address);
> =C2=A0
> -	spi_bus_lock(sigma_delta->spi->master);
> +	spi_bus_lock(sigma_delta->spi->controller);
> =C2=A0	sigma_delta->bus_locked =3D true;
> =C2=A0	sigma_delta->keep_cs_asserted =3D true;
> =C2=A0	reinit_completion(&sigma_delta->completion);
> @@ -322,7 +322,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev
> *indio_dev,
> =C2=A0	sigma_delta->keep_cs_asserted =3D false;
> =C2=A0	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
> =C2=A0	sigma_delta->bus_locked =3D false;
> -	spi_bus_unlock(sigma_delta->spi->master);
> +	spi_bus_unlock(sigma_delta->spi->controller);
> =C2=A0	iio_device_release_direct_mode(indio_dev);
> =C2=A0
> =C2=A0	if (ret)
> @@ -387,7 +387,7 @@ static int ad_sd_buffer_postenable(struct iio_dev
> *indio_dev)
> =C2=A0
> =C2=A0	sigma_delta->samples_buf =3D samples_buf;
> =C2=A0
> -	spi_bus_lock(sigma_delta->spi->master);
> +	spi_bus_lock(sigma_delta->spi->controller);
> =C2=A0	sigma_delta->bus_locked =3D true;
> =C2=A0	sigma_delta->keep_cs_asserted =3D true;
> =C2=A0
> @@ -401,7 +401,7 @@ static int ad_sd_buffer_postenable(struct iio_dev
> *indio_dev)
> =C2=A0	return 0;
> =C2=A0
> =C2=A0err_unlock:
> -	spi_bus_unlock(sigma_delta->spi->master);
> +	spi_bus_unlock(sigma_delta->spi->controller);
> =C2=A0
> =C2=A0	return ret;
> =C2=A0}
> @@ -426,7 +426,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev
> *indio_dev)
> =C2=A0
> =C2=A0	ad_sigma_delta_disable_all(sigma_delta);
> =C2=A0	sigma_delta->bus_locked =3D false;
> -	return spi_bus_unlock(sigma_delta->spi->master);
> +	return spi_bus_unlock(sigma_delta->spi->controller);
> =C2=A0}
> =C2=A0
> =C2=A0static irqreturn_t ad_sd_trigger_handler(int irq, void *p)