spi: coldfire-qspi: 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-17-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 31174e7..f0b630f 100644 (file)
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -286,7 +286,7 @@ static void mcfqspi_transfer_msg16(struct mcfqspi *mcfqspi, unsigned count,
 
 static void mcfqspi_set_cs(struct spi_device *spi, bool enable)
 {
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(spi->master);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(spi->controller);
        bool cs_high = spi->mode & SPI_CS_HIGH;
 
        if (enable)
@@ -295,11 +295,11 @@ static void mcfqspi_set_cs(struct spi_device *spi, bool enable)
                mcfqspi_cs_deselect(mcfqspi, spi_get_chipselect(spi, 0), cs_high);
 }
 
-static int mcfqspi_transfer_one(struct spi_master *master,
+static int mcfqspi_transfer_one(struct spi_controller *host,
                                struct spi_device *spi,
                                struct spi_transfer *t)
 {
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
        u16 qmr = MCFQSPI_QMR_MSTR;
 
        qmr |= t->bits_per_word << 10;
@@ -323,7 +323,7 @@ static int mcfqspi_transfer_one(struct spi_master *master,
 
 static int mcfqspi_setup(struct spi_device *spi)
 {
-       mcfqspi_cs_deselect(spi_master_get_devdata(spi->master),
+       mcfqspi_cs_deselect(spi_controller_get_devdata(spi->controller),
                            spi_get_chipselect(spi, 0), spi->mode & SPI_CS_HIGH);
 
        dev_dbg(&spi->dev,
@@ -337,7 +337,7 @@ static int mcfqspi_setup(struct spi_device *spi)
 
 static int mcfqspi_probe(struct platform_device *pdev)
 {
-       struct spi_master *master;
+       struct spi_controller *host;
        struct mcfqspi *mcfqspi;
        struct mcfqspi_platform_data *pdata;
        int status;
@@ -353,13 +353,13 @@ static int mcfqspi_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       master = spi_alloc_master(&pdev->dev, sizeof(*mcfqspi));
-       if (master == NULL) {
-               dev_dbg(&pdev->dev, "spi_alloc_master failed\n");
+       host = spi_alloc_host(&pdev->dev, sizeof(*mcfqspi));
+       if (host == NULL) {
+               dev_dbg(&pdev->dev, "spi_alloc_host failed\n");
                return -ENOMEM;
        }
 
-       mcfqspi = spi_master_get_devdata(master);
+       mcfqspi = spi_controller_get_devdata(host);
 
        mcfqspi->iobase = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(mcfqspi->iobase)) {
@@ -388,8 +388,8 @@ static int mcfqspi_probe(struct platform_device *pdev)
                goto fail0;
        }
 
-       master->bus_num = pdata->bus_num;
-       master->num_chipselect = pdata->num_chipselect;
+       host->bus_num = pdata->bus_num;
+       host->num_chipselect = pdata->num_chipselect;
 
        mcfqspi->cs_control = pdata->cs_control;
        status = mcfqspi_cs_setup(mcfqspi);
@@ -400,19 +400,19 @@ static int mcfqspi_probe(struct platform_device *pdev)
 
        init_waitqueue_head(&mcfqspi->waitq);
 
-       master->mode_bits = SPI_CS_HIGH | SPI_CPOL | SPI_CPHA;
-       master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);
-       master->setup = mcfqspi_setup;
-       master->set_cs = mcfqspi_set_cs;
-       master->transfer_one = mcfqspi_transfer_one;
-       master->auto_runtime_pm = true;
+       host->mode_bits = SPI_CS_HIGH | SPI_CPOL | SPI_CPHA;
+       host->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);
+       host->setup = mcfqspi_setup;
+       host->set_cs = mcfqspi_set_cs;
+       host->transfer_one = mcfqspi_transfer_one;
+       host->auto_runtime_pm = true;
 
-       platform_set_drvdata(pdev, master);
+       platform_set_drvdata(pdev, host);
        pm_runtime_enable(&pdev->dev);
 
-       status = devm_spi_register_master(&pdev->dev, master);
+       status = devm_spi_register_controller(&pdev->dev, host);
        if (status) {
-               dev_dbg(&pdev->dev, "spi_register_master failed\n");
+               dev_dbg(&pdev->dev, "devm_spi_register_controller failed\n");
                goto fail1;
        }
 
@@ -424,7 +424,7 @@ fail1:
        pm_runtime_disable(&pdev->dev);
        mcfqspi_cs_teardown(mcfqspi);
 fail0:
-       spi_master_put(master);
+       spi_controller_put(host);
 
        dev_dbg(&pdev->dev, "Coldfire QSPI probe failed\n");
 
@@ -433,8 +433,8 @@ fail0:
 
 static void mcfqspi_remove(struct platform_device *pdev)
 {
-       struct spi_master *master = platform_get_drvdata(pdev);
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = platform_get_drvdata(pdev);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
 
        pm_runtime_disable(&pdev->dev);
        /* disable the hardware (set the baud rate to 0) */
@@ -447,11 +447,11 @@ static void mcfqspi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int mcfqspi_suspend(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
        int ret;
 
-       ret = spi_master_suspend(master);
+       ret = spi_controller_suspend(host);
        if (ret)
                return ret;
 
@@ -462,20 +462,20 @@ static int mcfqspi_suspend(struct device *dev)
 
 static int mcfqspi_resume(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
 
        clk_enable(mcfqspi->clk);
 
-       return spi_master_resume(master);
+       return spi_controller_resume(host);
 }
 #endif
 
 #ifdef CONFIG_PM
 static int mcfqspi_runtime_suspend(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
 
        clk_disable(mcfqspi->clk);
 
@@ -484,8 +484,8 @@ static int mcfqspi_runtime_suspend(struct device *dev)
 
 static int mcfqspi_runtime_resume(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct mcfqspi *mcfqspi = spi_controller_get_devdata(host);
 
        clk_enable(mcfqspi->clk);