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>

diff --git a/drivers/spi/spi-cavium.c b/drivers/spi/spi-cavium.c
index dfe224defd6eda55aefed6b6775790d8847acdae..26b8cd1c76e1cbb06df593fc1db4c384b791a9eb 100644 (file)
--- a/drivers/spi/spi-cavium.c
+++ b/drivers/spi/spi-cavium.c
@@ -124,10 +124,10 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
        return xfer->len;
 }
 
-int octeon_spi_transfer_one_message(struct spi_master *master,
+int octeon_spi_transfer_one_message(struct spi_controller *ctlr,
                                    struct spi_message *msg)
 {
-       struct octeon_spi *p = spi_master_get_devdata(master);
+       struct octeon_spi *p = spi_controller_get_devdata(ctlr);
        unsigned int total_len = 0;
        int status = 0;
        struct spi_transfer *xfer;
@@ -145,6 +145,6 @@ int octeon_spi_transfer_one_message(struct spi_master *master,
 err:
        msg->status = status;
        msg->actual_length = total_len;
-       spi_finalize_current_message(master);
+       spi_finalize_current_message(ctlr);
        return status;
 }

diff --git a/drivers/spi/spi-cavium.h b/drivers/spi/spi-cavium.h
index 1f3ac463a20ba8eaa6d1c9b374b277f049a5edf2..af53a0c31476bdfafda39d0797862450f2e357c0 100644 (file)
--- a/drivers/spi/spi-cavium.h
+++ b/drivers/spi/spi-cavium.h
@@ -28,7 +28,7 @@ struct octeon_spi {
 #define OCTEON_SPI_TX(x)       (x->regs.tx)
 #define OCTEON_SPI_DAT0(x)     (x->regs.data)
 
-int octeon_spi_transfer_one_message(struct spi_master *master,
+int octeon_spi_transfer_one_message(struct spi_controller *ctlr,
                                    struct spi_message *msg);
 
 /* MPI register descriptions */