spi: gxp: 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/20230807124105.3429709-13-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-gxp.c b/drivers/spi/spi-gxp.c
index 88ab3032736b34efcb8fef9001392033484c56a2..fd2fac236bbd887160bcf7e25bc65ded4eb4a947 100644 (file)
--- a/drivers/spi/spi-gxp.c
+++ b/drivers/spi/spi-gxp.c
@@ -199,7 +199,7 @@ static ssize_t gxp_spi_write(struct gxp_spi_chip *chip, const struct spi_mem_op
 
 static int do_gxp_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)
 {
-       struct gxp_spi *spifi = spi_controller_get_devdata(mem->spi->master);
+       struct gxp_spi *spifi = spi_controller_get_devdata(mem->spi->controller);
        struct gxp_spi_chip *chip = &spifi->chips[spi_get_chipselect(mem->spi, 0)];
        int ret;
 
@@ -235,7 +235,7 @@ static const struct spi_controller_mem_ops gxp_spi_mem_ops = {
 
 static int gxp_spi_setup(struct spi_device *spi)
 {
-       struct gxp_spi *spifi = spi_controller_get_devdata(spi->master);
+       struct gxp_spi *spifi = spi_controller_get_devdata(spi->controller);
        unsigned int cs = spi_get_chipselect(spi, 0);
        struct gxp_spi_chip *chip = &spifi->chips[cs];
 
@@ -257,7 +257,7 @@ static int gxp_spifi_probe(struct platform_device *pdev)
 
        data = of_device_get_match_data(&pdev->dev);
 
-       ctlr = devm_spi_alloc_master(dev, sizeof(*spifi));
+       ctlr = devm_spi_alloc_host(dev, sizeof(*spifi));
        if (!ctlr)
                return -ENOMEM;