From: "Nuno Sá" <noname.nuno@gmail.com>
To: "Uwe Kleine-König" <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>
Subject: Re: [PATCH v3 03/32] iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller"
Date: Thu, 08 Feb 2024 09:14:02 +0100 [thread overview]
Message-ID: <a9ddd254d985e5e9e29466199ee45a9733d4043a.camel@gmail.com> (raw)
In-Reply-To: <de866d09c80c89816df62602ba4ba8ba30e9971f.1707324794.git.u.kleine-koenig@pengutronix.de>
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 <Jonathan.Cameron@huawei.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
Acked-by: Nuno Sa <nuno.sa@analog.com>
> 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)
next prev parent reply other threads:[~2024-02-08 8:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 18:40 [PATCH v3 00/32] spi: get rid of some legacy macros Uwe Kleine-König
2024-02-07 18:40 ` [PATCH v3 03/32] iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-02-08 8:14 ` Nuno Sá [this message]
2024-02-08 21:21 ` [PATCH v3 00/32] spi: get rid of some legacy macros Mark Brown
2024-03-25 1:54 ` patchwork-bot+chrome-platform
2024-03-25 2:13 ` patchwork-bot+chrome-platform
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a9ddd254d985e5e9e29466199ee45a9733d4043a.camel@gmail.com \
--to=noname.nuno@gmail.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=Michael.Hennerich@analog.com \
--cc=broonie@kernel.org \
--cc=jic23@kernel.org \
--cc=kernel@pengutronix.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).