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@xxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxx>
BR, Jarkko
