spi: Convert to SPI_CONTROLLER_HALF_DUPLEX

Convert the users under SPI subsystem to SPI_CONTROLLER_HALF_DUPLEX.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-15-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c
index fecead757a3cd66c211102545fea5950de6c7573..b19766571f282d546a1475aaf7fe80460357e6f8 100644 (file)
--- a/drivers/spi/spi-amd.c
+++ b/drivers/spi/spi-amd.c
@@ -404,7 +404,7 @@ static int amd_spi_probe(struct platform_device *pdev)
        master->bus_num = 0;
        master->num_chipselect = 4;
        master->mode_bits = 0;
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->max_speed_hz = AMD_SPI_MAX_HZ;
        master->min_speed_hz = AMD_SPI_MIN_HZ;
        master->setup = amd_spi_master_setup;

diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c
index 60c0d693465408aa7a2b22a9bd1919d193b4664a..535f7eb9fa69fed494be401667df8a72b96b3a21 100644 (file)
--- a/drivers/spi/spi-cavium-thunderx.c
+++ b/drivers/spi/spi-cavium-thunderx.c
@@ -64,7 +64,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev,
                p->sys_freq = SYS_FREQ_DEFAULT;
        dev_info(dev, "Set system clock to %u\n", p->sys_freq);
 
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->num_chipselect = 4;
        master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_CS_HIGH |
                            SPI_LSB_FIRST | SPI_3WIRE;

diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c
index 4c103dff0d4453d1b2e855f4f2c5dc5f622d0092..8a8414cbb4001e81272da7fac5a2e601d4196736 100644 (file)
--- a/drivers/spi/spi-falcon.c
+++ b/drivers/spi/spi-falcon.c
@@ -401,7 +401,7 @@ static int falcon_sflash_probe(struct platform_device *pdev)
        priv->master = master;
 
        master->mode_bits = SPI_MODE_3;
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->setup = falcon_sflash_setup;
        master->transfer_one_message = falcon_sflash_xfer_one;
        master->dev.of_node = pdev->dev.of_node;

diff --git a/drivers/spi/spi-lp8841-rtc.c b/drivers/spi/spi-lp8841-rtc.c
index ccaa7a9463594ec0709e00e4d83eceee75bd7994..c6810720b3b5a7b63de45a92b3ec7a61793b671a 100644 (file)
--- a/drivers/spi/spi-lp8841-rtc.c
+++ b/drivers/spi/spi-lp8841-rtc.c
@@ -191,7 +191,7 @@ spi_lp8841_rtc_probe(struct platform_device *pdev)
                return -ENOMEM;
        platform_set_drvdata(pdev, master);
 
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->mode_bits = SPI_CS_HIGH | SPI_3WIRE | SPI_LSB_FIRST;
 
        master->bus_num = pdev->id;

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 963a53dd680ba15077a701f28cf1a36f20d2b0d4..cd0e7ae07162c0258d4f5f114483f9a5bc02b46c 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -572,7 +572,7 @@ static int mxs_spi_probe(struct platform_device *pdev)
        master->mode_bits = SPI_CPOL | SPI_CPHA;
        master->num_chipselect = 3;
        master->dev.of_node = np;
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->auto_runtime_pm = true;
 
        spi = spi_master_get_devdata(master);

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index 902d2e0c1f2fc57a1a1cdb3c4d3cb6fca02e187d..f89aa9e52c23e856bc17852e966c5e35e585681c 100644 (file)
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -486,7 +486,7 @@ static int uwire_probe(struct platform_device *pdev)
        /* the spi->mode bits understood by this driver: */
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
        master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
 
        master->bus_num = 2;    /* "official" */
        master->num_chipselect = 4;

diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c
index 51dfb49523f3466d9d22fdcf3079b3857f6b1499..5cbebcf26a2a407443068190bbdb8a9586f13b65 100644 (file)
--- a/drivers/spi/spi-pic32-sqi.c
+++ b/drivers/spi/spi-pic32-sqi.c
@@ -648,7 +648,7 @@ static int pic32_sqi_probe(struct platform_device *pdev)
        master->dev.of_node     = pdev->dev.of_node;
        master->mode_bits       = SPI_MODE_3 | SPI_MODE_0 | SPI_TX_DUAL |
                                  SPI_RX_DUAL | SPI_TX_QUAD | SPI_RX_QUAD;
-       master->flags           = SPI_MASTER_HALF_DUPLEX;
+       master->flags           = SPI_CONTROLLER_HALF_DUPLEX;
        master->can_dma         = pic32_sqi_can_dma;
        master->bits_per_word_mask      = SPI_BPW_RANGE_MASK(8, 32);
        master->transfer_one_message    = pic32_sqi_one_message;

diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index a8a683d6145c2681446d56c5de699fc2f21cd0d8..5a98c52bad320eed5c90bf8b52abdfc71f4efdce 100644 (file)
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -724,7 +724,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
        master->mode_bits = SPI_MODE_0 |
                            SPI_TX_DUAL | SPI_RX_DUAL |
                            SPI_TX_QUAD | SPI_RX_QUAD;
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->prepare_message = qcom_qspi_prepare_message;
        master->transfer_one = qcom_qspi_transfer_one;
        master->handle_err = qcom_qspi_handle_err;

diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
index 583f4187f03035d14918e8874eeb320839318485..bd550e76ab3d2e051713347cc56e10b0a786298f 100644 (file)
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@ -565,7 +565,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
        if (!master)
                return -ENOMEM;
 
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->mem_ops = &rockchip_sfc_mem_ops;
        master->dev.of_node = pdev->dev.of_node;
        master->mode_bits = SPI_TX_QUAD | SPI_TX_DUAL | SPI_RX_QUAD | SPI_RX_DUAL;

diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
index 22e39c4c12c4e9d48406cedf22e2b6d92fc550e6..94d16aadfa4428d1e675cecb67b1e7ba41d26f6c 100644 (file)
--- a/drivers/spi/spi-sprd-adi.c
+++ b/drivers/spi/spi-sprd-adi.c
@@ -580,7 +580,7 @@ static int sprd_adi_probe(struct platform_device *pdev)
        ctlr->dev.of_node = pdev->dev.of_node;
        ctlr->bus_num = pdev->id;
        ctlr->num_chipselect = num_chipselect;
-       ctlr->flags = SPI_MASTER_HALF_DUPLEX;
+       ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX;
        ctlr->bits_per_word_mask = 0;
        ctlr->transfer_one = sprd_adi_transfer_one;
 

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 5914335ff63db0521ee2a16866147ba2d9206bc0..bf4b40289beecac06ef7b0436ecfacd651577b3c 100644 (file)
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -770,7 +770,7 @@ static int ti_qspi_probe(struct platform_device *pdev)
 
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD;
 
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->setup = ti_qspi_setup;
        master->auto_runtime_pm = true;
        master->transfer_one_message = ti_qspi_start_transfer_one;

diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index ae6218bcd02a072235e72d443769b8665debbedf..a3d57554f5bad80eeff8d66b867b449bd0fcbc4b 100644 (file)
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -218,7 +218,7 @@ static int spi_xcomm_probe(struct i2c_client *i2c)
        master->num_chipselect = 16;
        master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_3WIRE;
        master->bits_per_word_mask = SPI_BPW_MASK(8);
-       master->flags = SPI_MASTER_HALF_DUPLEX;
+       master->flags = SPI_CONTROLLER_HALF_DUPLEX;
        master->transfer_one_message = spi_xcomm_transfer_one;
        master->dev.of_node = i2c->dev.of_node;
        i2c_set_clientdata(i2c, master);