Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: cavium: Follow renaming of SPI "master" to "controller"

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>
Link: https://lore.kernel.org/r/8aa122cffa6c8c18cc3367def872f81cd9471f2a.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Uwe Kleine-König and committed by
Mark Brown
1747fbde 28e59d8b

+4 -4
+3 -3
drivers/spi/spi-cavium.c
··· 124 124 return xfer->len; 125 125 } 126 126 127 - int octeon_spi_transfer_one_message(struct spi_master *master, 127 + int octeon_spi_transfer_one_message(struct spi_controller *ctlr, 128 128 struct spi_message *msg) 129 129 { 130 - struct octeon_spi *p = spi_master_get_devdata(master); 130 + struct octeon_spi *p = spi_controller_get_devdata(ctlr); 131 131 unsigned int total_len = 0; 132 132 int status = 0; 133 133 struct spi_transfer *xfer; ··· 145 145 err: 146 146 msg->status = status; 147 147 msg->actual_length = total_len; 148 - spi_finalize_current_message(master); 148 + spi_finalize_current_message(ctlr); 149 149 return status; 150 150 }
+1 -1
drivers/spi/spi-cavium.h
··· 28 28 #define OCTEON_SPI_TX(x) (x->regs.tx) 29 29 #define OCTEON_SPI_DAT0(x) (x->regs.data) 30 30 31 - int octeon_spi_transfer_one_message(struct spi_master *master, 31 + int octeon_spi_transfer_one_message(struct spi_controller *ctlr, 32 32 struct spi_message *msg); 33 33 34 34 /* MPI register descriptions */