spi: atmel-quadspi: 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/20230110131805.2827248-4-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 70637e4..f4632cb 100644 (file)
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -406,7 +406,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq,
 
 static int atmel_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
 {
-       struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->master);
+       struct atmel_qspi *aq = spi_controller_get_devdata(mem->spi->controller);
        u32 sr, offset;
        int err;
 
@@ -476,7 +476,7 @@ static const struct spi_controller_mem_ops atmel_qspi_mem_ops = {
 
 static int atmel_qspi_setup(struct spi_device *spi)
 {
-       struct spi_controller *ctrl = spi->master;
+       struct spi_controller *ctrl = spi->controller;
        struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
        unsigned long src_rate;
        u32 scbr;
@@ -512,7 +512,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
 
 static int atmel_qspi_set_cs_timing(struct spi_device *spi)
 {
-       struct spi_controller *ctrl = spi->master;
+       struct spi_controller *ctrl = spi->controller;
        struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
        unsigned long clk_rate;
        u32 cs_setup;
@@ -582,7 +582,7 @@ static int atmel_qspi_probe(struct platform_device *pdev)
        struct resource *res;
        int irq, err = 0;
 
-       ctrl = devm_spi_alloc_master(&pdev->dev, sizeof(*aq));
+       ctrl = devm_spi_alloc_host(&pdev->dev, sizeof(*aq));
        if (!ctrl)
                return -ENOMEM;