Unverified Commit b6af14ea authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

tpm_tis_spi: Follow renaming of SPI "master" to "controller" 



In commit 8caab75f ("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.

Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/29000c8fc0612974242e3c23d14dd4771b92c71e.1707324794.git.u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ee3c668d

drivers/char/tpm/tpm_tis_spi_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}