From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Mark Brown" <broonie@kernel.org>,
"Geert Uytterhoeven" <geert+renesas@glider.be>
Cc: <linux-spi@vger.kernel.org>, <kernel@pengutronix.de>,
"Peter Huewe" <peterhuewe@gmx.de>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
<linux-integrity@vger.kernel.org>
Subject: Re: [PATCH 27/33] tpm_tis_spi: Follow renaming of SPI "master" to "controller"
Date: Fri, 19 Jan 2024 21:29:33 +0000 [thread overview]
Message-ID: <CYJ03UKAG12Z.1BIINI4G2A47G@seitikki> (raw)
In-Reply-To: <31f11901f6329a1de0299903d43c16439948bd46.1705348270.git.u.kleine-koenig@pengutronix.de>
On Mon Jan 15, 2024 at 8:13 PM UTC, 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.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> drivers/char/tpm/tpm_tis_spi_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
> index c5c3197ee29f..c647de7b3709 100644
> --- a/drivers/char/tpm/tpm_tis_spi_main.c
> +++ b/drivers/char/tpm/tpm_tis_spi_main.c
> @@ -146,7 +146,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_data *data, u32 addr,
> struct spi_transfer spi_xfer;
> u8 transfer_len;
>
> - spi_bus_lock(phy->spi_device->master);
> + spi_bus_lock(phy->spi_device->controller);
>
> while (len) {
> transfer_len = min_t(u16, len, MAX_SPI_FRAMESIZE);
> @@ -210,7 +210,7 @@ static int tpm_tis_spi_transfer_full(struct tpm_tis_data *data, u32 addr,
> spi_sync_locked(phy->spi_device, &m);
> }
>
> - spi_bus_unlock(phy->spi_device->master);
> + spi_bus_unlock(phy->spi_device->controller);
> return ret;
> }
>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
BR, Jarkko
next prev parent reply other threads:[~2024-01-19 21:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-15 20:12 [PATCH 00/33] spi: get rid of some legacy macros Uwe Kleine-König
2024-01-15 20:13 ` [PATCH 27/33] tpm_tis_spi: Follow renaming of SPI "master" to "controller" Uwe Kleine-König
2024-01-19 21:29 ` Jarkko Sakkinen [this message]
2024-01-16 14:40 ` [PATCH 00/33] spi: get rid of some legacy macros Mark Brown
2024-01-16 15:18 ` Uwe Kleine-König
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=CYJ03UKAG12Z.1BIINI4G2A47G@seitikki \
--to=jarkko@kernel.org \
--cc=broonie@kernel.org \
--cc=geert+renesas@glider.be \
--cc=jgg@ziepe.ca \
--cc=kernel@pengutronix.de \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--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).