spi: synquacer: 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://msgid.link/r/20231128093031.3707034-10-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c
index aeaf7db022f09cd37dca228435b374c20bda8150..7cb4301a6fb285239bbee686e1f2310fe09d7a22 100644 (file)
--- a/drivers/spi/spi-synquacer.c
+++ b/drivers/spi/spi-synquacer.c
@@ -225,11 +225,11 @@ static int write_fifo(struct synquacer_spi *sspi)
        return 0;
 }
 
-static int synquacer_spi_config(struct spi_master *master,
+static int synquacer_spi_config(struct spi_controller *host,
                                struct spi_device *spi,
                                struct spi_transfer *xfer)
 {
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
        unsigned int speed, mode, bpw, cs, bus_width, transfer_mode;
        u32 rate, val, div;
 
@@ -263,7 +263,7 @@ static int synquacer_spi_config(struct spi_master *master,
        }
 
        sspi->transfer_mode = transfer_mode;
-       rate = master->max_speed_hz;
+       rate = host->max_speed_hz;
 
        div = DIV_ROUND_UP(rate, speed);
        if (div > 254) {
@@ -350,11 +350,11 @@ static int synquacer_spi_config(struct spi_master *master,
        return 0;
 }
 
-static int synquacer_spi_transfer_one(struct spi_master *master,
+static int synquacer_spi_transfer_one(struct spi_controller *host,
                                      struct spi_device *spi,
                                      struct spi_transfer *xfer)
 {
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
        int ret;
        int status = 0;
        u32 words;
@@ -378,7 +378,7 @@ static int synquacer_spi_transfer_one(struct spi_master *master,
        if (bpw == 8 && !(xfer->len % 4) && !(spi->mode & SPI_LSB_FIRST))
                xfer->bits_per_word = 32;
 
-       ret = synquacer_spi_config(master, spi, xfer);
+       ret = synquacer_spi_config(host, spi, xfer);
 
        /* restore */
        xfer->bits_per_word = bpw;
@@ -482,7 +482,7 @@ static int synquacer_spi_transfer_one(struct spi_master *master,
 
 static void synquacer_spi_set_cs(struct spi_device *spi, bool enable)
 {
-       struct synquacer_spi *sspi = spi_master_get_devdata(spi->master);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(spi->controller);
        u32 val;
 
        val = readl(sspi->regs + SYNQUACER_HSSPI_REG_DMSTART);
@@ -517,11 +517,11 @@ static int synquacer_spi_wait_status_update(struct synquacer_spi *sspi,
        return -EBUSY;
 }
 
-static int synquacer_spi_enable(struct spi_master *master)
+static int synquacer_spi_enable(struct spi_controller *host)
 {
        u32 val;
        int status;
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
 
        /* Disable module */
        writel(0, sspi->regs + SYNQUACER_HSSPI_REG_MCTRL);
@@ -601,18 +601,18 @@ static irqreturn_t sq_spi_tx_handler(int irq, void *priv)
 static int synquacer_spi_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct spi_master *master;
+       struct spi_controller *host;
        struct synquacer_spi *sspi;
        int ret;
        int rx_irq, tx_irq;
 
-       master = spi_alloc_master(&pdev->dev, sizeof(*sspi));
-       if (!master)
+       host = spi_alloc_host(&pdev->dev, sizeof(*sspi));
+       if (!host)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, master);
+       platform_set_drvdata(pdev, host);
 
-       sspi = spi_master_get_devdata(master);
+       sspi = spi_controller_get_devdata(host);
        sspi->dev = &pdev->dev;
 
        init_completion(&sspi->transfer_done);
@@ -625,7 +625,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)
 
        sspi->clk_src_type = SYNQUACER_HSSPI_CLOCK_SRC_IHCLK; /* Default */
        device_property_read_u32(&pdev->dev, "socionext,ihclk-rate",
-                                &master->max_speed_hz); /* for ACPI */
+                                &host->max_speed_hz); /* for ACPI */
 
        if (dev_of_node(&pdev->dev)) {
                if (device_property_match_string(&pdev->dev,
@@ -655,21 +655,21 @@ static int synquacer_spi_probe(struct platform_device *pdev)
                        goto put_spi;
                }
 
-               master->max_speed_hz = clk_get_rate(sspi->clk);
+               host->max_speed_hz = clk_get_rate(sspi->clk);
        }
 
-       if (!master->max_speed_hz) {
+       if (!host->max_speed_hz) {
                dev_err(&pdev->dev, "missing clock source\n");
                ret = -EINVAL;
                goto disable_clk;
        }
-       master->min_speed_hz = master->max_speed_hz / 254;
+       host->min_speed_hz = host->max_speed_hz / 254;
 
        sspi->aces = device_property_read_bool(&pdev->dev,
                                               "socionext,set-aces");
        sspi->rtm = device_property_read_bool(&pdev->dev, "socionext,use-rtm");
 
-       master->num_chipselect = SYNQUACER_HSSPI_NUM_CHIP_SELECT;
+       host->num_chipselect = SYNQUACER_HSSPI_NUM_CHIP_SELECT;
 
        rx_irq = platform_get_irq(pdev, 0);
        if (rx_irq <= 0) {
@@ -699,27 +699,27 @@ static int synquacer_spi_probe(struct platform_device *pdev)
                goto disable_clk;
        }
 
-       master->dev.of_node = np;
-       master->dev.fwnode = pdev->dev.fwnode;
-       master->auto_runtime_pm = true;
-       master->bus_num = pdev->id;
+       host->dev.of_node = np;
+       host->dev.fwnode = pdev->dev.fwnode;
+       host->auto_runtime_pm = true;
+       host->bus_num = pdev->id;
 
-       master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_TX_DUAL | SPI_RX_DUAL |
-                           SPI_TX_QUAD | SPI_RX_QUAD;
-       master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) |
-                                    SPI_BPW_MASK(16) | SPI_BPW_MASK(8);
+       host->mode_bits = SPI_CPOL | SPI_CPHA | SPI_TX_DUAL | SPI_RX_DUAL |
+                         SPI_TX_QUAD | SPI_RX_QUAD;
+       host->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(24) |
+                                  SPI_BPW_MASK(16) | SPI_BPW_MASK(8);
 
-       master->set_cs = synquacer_spi_set_cs;
-       master->transfer_one = synquacer_spi_transfer_one;
+       host->set_cs = synquacer_spi_set_cs;
+       host->transfer_one = synquacer_spi_transfer_one;
 
-       ret = synquacer_spi_enable(master);
+       ret = synquacer_spi_enable(host);
        if (ret)
                goto disable_clk;
 
        pm_runtime_set_active(sspi->dev);
        pm_runtime_enable(sspi->dev);
 
-       ret = devm_spi_register_master(sspi->dev, master);
+       ret = devm_spi_register_controller(sspi->dev, host);
        if (ret)
                goto disable_pm;
 
@@ -730,15 +730,15 @@ disable_pm:
 disable_clk:
        clk_disable_unprepare(sspi->clk);
 put_spi:
-       spi_master_put(master);
+       spi_controller_put(host);
 
        return ret;
 }
 
 static void synquacer_spi_remove(struct platform_device *pdev)
 {
-       struct spi_master *master = platform_get_drvdata(pdev);
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct spi_controller *host = platform_get_drvdata(pdev);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
 
        pm_runtime_disable(sspi->dev);
 
@@ -747,11 +747,11 @@ static void synquacer_spi_remove(struct platform_device *pdev)
 
 static int __maybe_unused synquacer_spi_suspend(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
        int ret;
 
-       ret = spi_master_suspend(master);
+       ret = spi_controller_suspend(host);
        if (ret)
                return ret;
 
@@ -763,8 +763,8 @@ static int __maybe_unused synquacer_spi_suspend(struct device *dev)
 
 static int __maybe_unused synquacer_spi_resume(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct synquacer_spi *sspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct synquacer_spi *sspi = spi_controller_get_devdata(host);
        int ret;
 
        if (!pm_runtime_suspended(dev)) {
@@ -778,7 +778,7 @@ static int __maybe_unused synquacer_spi_resume(struct device *dev)
                        return ret;
                }
 
-               ret = synquacer_spi_enable(master);
+               ret = synquacer_spi_enable(host);
                if (ret) {
                        clk_disable_unprepare(sspi->clk);
                        dev_err(dev, "failed to enable spi (%d)\n", ret);
@@ -786,7 +786,7 @@ static int __maybe_unused synquacer_spi_resume(struct device *dev)
                }
        }
 
-       ret = spi_master_resume(master);
+       ret = spi_controller_resume(host);
        if (ret < 0)
                clk_disable_unprepare(sspi->clk);