spi: tegra210-quad: 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-15-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
index e9ad9b0b598b509d8197e51493031c6e0f2001f4..afbd64a217eb06abd029191902432337108e559c 100644 (file)
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -175,7 +175,7 @@ struct tegra_qspi_client_data {
 
 struct tegra_qspi {
        struct device                           *dev;
-       struct spi_master                       *master;
+       struct spi_controller                   *host;
        /* lock to protect data accessed by irq */
        spinlock_t                              lock;
 
@@ -809,7 +809,7 @@ err_out:
 static u32 tegra_qspi_setup_transfer_one(struct spi_device *spi, struct spi_transfer *t,
                                         bool is_first_of_msg)
 {
-       struct tegra_qspi *tqspi = spi_master_get_devdata(spi->master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(spi->controller);
        struct tegra_qspi_client_data *cdata = spi->controller_data;
        u32 command1, command2, speed = t->speed_hz;
        u8 bits_per_word = t->bits_per_word;
@@ -870,7 +870,7 @@ static u32 tegra_qspi_setup_transfer_one(struct spi_device *spi, struct spi_tran
 static int tegra_qspi_start_transfer_one(struct spi_device *spi,
                                         struct spi_transfer *t, u32 command1)
 {
-       struct tegra_qspi *tqspi = spi_master_get_devdata(spi->master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(spi->controller);
        unsigned int total_fifo_words;
        u8 bus_width = 0;
        int ret;
@@ -925,7 +925,7 @@ static int tegra_qspi_start_transfer_one(struct spi_device *spi,
 static struct tegra_qspi_client_data *tegra_qspi_parse_cdata_dt(struct spi_device *spi)
 {
        struct tegra_qspi_client_data *cdata;
-       struct tegra_qspi *tqspi = spi_master_get_devdata(spi->master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(spi->controller);
 
        cdata = devm_kzalloc(tqspi->dev, sizeof(*cdata), GFP_KERNEL);
        if (!cdata)
@@ -941,7 +941,7 @@ static struct tegra_qspi_client_data *tegra_qspi_parse_cdata_dt(struct spi_devic
 
 static int tegra_qspi_setup(struct spi_device *spi)
 {
-       struct tegra_qspi *tqspi = spi_master_get_devdata(spi->master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(spi->controller);
        struct tegra_qspi_client_data *cdata = spi->controller_data;
        unsigned long flags;
        u32 val;
@@ -1005,7 +1005,7 @@ static void tegra_qspi_handle_error(struct tegra_qspi *tqspi)
 
 static void tegra_qspi_transfer_end(struct spi_device *spi)
 {
-       struct tegra_qspi *tqspi = spi_master_get_devdata(spi->master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(spi->controller);
        int cs_val = (spi->mode & SPI_CS_HIGH) ? 0 : 1;
 
        if (cs_val)
@@ -1316,10 +1316,10 @@ static bool tegra_qspi_validate_cmb_seq(struct tegra_qspi *tqspi,
        return true;
 }
 
-static int tegra_qspi_transfer_one_message(struct spi_master *master,
+static int tegra_qspi_transfer_one_message(struct spi_controller *host,
                                           struct spi_message *msg)
 {
-       struct tegra_qspi *tqspi = spi_master_get_devdata(master);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(host);
        int ret;
 
        if (tegra_qspi_validate_cmb_seq(tqspi, msg))
@@ -1327,7 +1327,7 @@ static int tegra_qspi_transfer_one_message(struct spi_master *master,
        else
                ret = tegra_qspi_non_combined_seq_xfer(tqspi, msg);
 
-       spi_finalize_current_message(master);
+       spi_finalize_current_message(host);
 
        return ret;
 }
@@ -1533,38 +1533,38 @@ MODULE_DEVICE_TABLE(acpi, tegra_qspi_acpi_match);
 
 static int tegra_qspi_probe(struct platform_device *pdev)
 {
-       struct spi_master       *master;
+       struct spi_controller   *host;
        struct tegra_qspi       *tqspi;
        struct resource         *r;
        int ret, qspi_irq;
        int bus_num;
 
-       master = devm_spi_alloc_master(&pdev->dev, sizeof(*tqspi));
-       if (!master)
+       host = devm_spi_alloc_host(&pdev->dev, sizeof(*tqspi));
+       if (!host)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, master);
-       tqspi = spi_master_get_devdata(master);
+       platform_set_drvdata(pdev, host);
+       tqspi = spi_controller_get_devdata(host);
 
-       master->mode_bits = SPI_MODE_0 | SPI_MODE_3 | SPI_CS_HIGH |
-                           SPI_TX_DUAL | SPI_RX_DUAL | SPI_TX_QUAD | SPI_RX_QUAD;
-       master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) | SPI_BPW_MASK(8);
-       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
-       master->setup = tegra_qspi_setup;
-       master->transfer_one_message = tegra_qspi_transfer_one_message;
-       master->num_chipselect = 1;
-       master->auto_runtime_pm = true;
+       host->mode_bits = SPI_MODE_0 | SPI_MODE_3 | SPI_CS_HIGH |
+                         SPI_TX_DUAL | SPI_RX_DUAL | SPI_TX_QUAD | SPI_RX_QUAD;
+       host->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) | SPI_BPW_MASK(8);
+       host->flags = SPI_CONTROLLER_HALF_DUPLEX;
+       host->setup = tegra_qspi_setup;
+       host->transfer_one_message = tegra_qspi_transfer_one_message;
+       host->num_chipselect = 1;
+       host->auto_runtime_pm = true;
 
        bus_num = of_alias_get_id(pdev->dev.of_node, "spi");
        if (bus_num >= 0)
-               master->bus_num = bus_num;
+               host->bus_num = bus_num;
 
-       tqspi->master = master;
+       tqspi->host = host;
        tqspi->dev = &pdev->dev;
        spin_lock_init(&tqspi->lock);
 
        tqspi->soc_data = device_get_match_data(&pdev->dev);
-       master->num_chipselect = tqspi->soc_data->cs_count;
+       host->num_chipselect = tqspi->soc_data->cs_count;
        tqspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
        if (IS_ERR(tqspi->base))
                return PTR_ERR(tqspi->base);
@@ -1625,10 +1625,10 @@ static int tegra_qspi_probe(struct platform_device *pdev)
                goto exit_pm_disable;
        }
 
-       master->dev.of_node = pdev->dev.of_node;
-       ret = spi_register_master(master);
+       host->dev.of_node = pdev->dev.of_node;
+       ret = spi_register_controller(host);
        if (ret < 0) {
-               dev_err(&pdev->dev, "failed to register master: %d\n", ret);
+               dev_err(&pdev->dev, "failed to register host: %d\n", ret);
                goto exit_free_irq;
        }
 
@@ -1644,10 +1644,10 @@ exit_pm_disable:
 
 static void tegra_qspi_remove(struct platform_device *pdev)
 {
-       struct spi_master *master = platform_get_drvdata(pdev);
-       struct tegra_qspi *tqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = platform_get_drvdata(pdev);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(host);
 
-       spi_unregister_master(master);
+       spi_unregister_controller(host);
        free_irq(tqspi->irq, tqspi);
        pm_runtime_force_suspend(&pdev->dev);
        tegra_qspi_deinit_dma(tqspi);
@@ -1655,15 +1655,15 @@ static void tegra_qspi_remove(struct platform_device *pdev)
 
 static int __maybe_unused tegra_qspi_suspend(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
+       struct spi_controller *host = dev_get_drvdata(dev);
 
-       return spi_master_suspend(master);
+       return spi_controller_suspend(host);
 }
 
 static int __maybe_unused tegra_qspi_resume(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct tegra_qspi *tqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(host);
        int ret;
 
        ret = pm_runtime_resume_and_get(dev);
@@ -1676,13 +1676,13 @@ static int __maybe_unused tegra_qspi_resume(struct device *dev)
        tegra_qspi_writel(tqspi, tqspi->def_command2_reg, QSPI_COMMAND2);
        pm_runtime_put(dev);
 
-       return spi_master_resume(master);
+       return spi_controller_resume(host);
 }
 
 static int __maybe_unused tegra_qspi_runtime_suspend(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct tegra_qspi *tqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(host);
 
        /* Runtime pm disabled with ACPI */
        if (has_acpi_companion(tqspi->dev))
@@ -1697,8 +1697,8 @@ static int __maybe_unused tegra_qspi_runtime_suspend(struct device *dev)
 
 static int __maybe_unused tegra_qspi_runtime_resume(struct device *dev)
 {
-       struct spi_master *master = dev_get_drvdata(dev);
-       struct tegra_qspi *tqspi = spi_master_get_devdata(master);
+       struct spi_controller *host = dev_get_drvdata(dev);
+       struct tegra_qspi *tqspi = spi_controller_get_devdata(host);
        int ret;
 
        /* Runtime pm disabled with ACPI */