spi: octeon: switch to use modern name

Change legacy name master to modern name host or controller.

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230728093221.3312026-15-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeon.c
index 58060be..4511c3b 100644 (file)
--- a/drivers/spi/spi-cavium-octeon.c
+++ b/drivers/spi/spi-cavium-octeon.c
@@ -19,15 +19,15 @@
 static int octeon_spi_probe(struct platform_device *pdev)
 {
        void __iomem *reg_base;
-       struct spi_master *master;
+       struct spi_controller *host;
        struct octeon_spi *p;
        int err = -ENOENT;
 
-       master = spi_alloc_master(&pdev->dev, sizeof(struct octeon_spi));
-       if (!master)
+       host = spi_alloc_host(&pdev->dev, sizeof(struct octeon_spi));
+       if (!host)
                return -ENOMEM;
-       p = spi_master_get_devdata(master);
-       platform_set_drvdata(pdev, master);
+       p = spi_controller_get_devdata(host);
+       platform_set_drvdata(pdev, host);
 
        reg_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(reg_base)) {
@@ -43,21 +43,21 @@ static int octeon_spi_probe(struct platform_device *pdev)
        p->regs.tx = 0x10;
        p->regs.data = 0x80;
 
-       master->num_chipselect = 4;
-       master->mode_bits = SPI_CPHA |
+       host->num_chipselect = 4;
+       host->mode_bits = SPI_CPHA |
                            SPI_CPOL |
                            SPI_CS_HIGH |
                            SPI_LSB_FIRST |
                            SPI_3WIRE;
 
-       master->transfer_one_message = octeon_spi_transfer_one_message;
-       master->bits_per_word_mask = SPI_BPW_MASK(8);
-       master->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
+       host->transfer_one_message = octeon_spi_transfer_one_message;
+       host->bits_per_word_mask = SPI_BPW_MASK(8);
+       host->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
 
-       master->dev.of_node = pdev->dev.of_node;
-       err = devm_spi_register_master(&pdev->dev, master);
+       host->dev.of_node = pdev->dev.of_node;
+       err = devm_spi_register_controller(&pdev->dev, host);
        if (err) {
-               dev_err(&pdev->dev, "register master failed: %d\n", err);
+               dev_err(&pdev->dev, "register host failed: %d\n", err);
                goto fail;
        }
 
@@ -65,14 +65,14 @@ static int octeon_spi_probe(struct platform_device *pdev)
 
        return 0;
 fail:
-       spi_master_put(master);
+       spi_controller_put(host);
        return err;
 }
 
 static void octeon_spi_remove(struct platform_device *pdev)
 {
-       struct spi_master *master = platform_get_drvdata(pdev);
-       struct octeon_spi *p = spi_master_get_devdata(master);
+       struct spi_controller *host = platform_get_drvdata(pdev);
+       struct octeon_spi *p = spi_controller_get_devdata(host);
 
        /* Clear the CSENA* and put everything in a known state. */
        writeq(0, p->register_base + OCTEON_SPI_CFG(p));