treewide, spi: Get rid of SPI_MASTER_HALF_DUPLEX

The SPI_MASTER_HALF_DUPLEX is the legacy name of a definition
for a half duplex flag. Since all others had been replaced with
the respective SPI_CONTROLLER prefix get rid of the last one
as well. There is no functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> # for input
Acked-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20231113111249.3982461-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c
index 852aeb0b2c07cafdb53ed0439868072dc3739a0e..07c866f42296b50ad2e581c19def296aadcf22df 100644 (file)
--- a/drivers/input/rmi4/rmi_spi.c
+++ b/drivers/input/rmi4/rmi_spi.c
@@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi)
        struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data;
        int error;
 
-       if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
+       if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
                return -EINVAL;
 
        rmi_spi = devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport),

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index cc333ad67cac81baf69a1c273a473496701c6e0e..b0cccef4cfbf7df086851abf1daf664b3c151ad9 100644 (file)
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1322,7 +1322,7 @@ static int mmc_spi_probe(struct spi_device *spi)
        /* We rely on full duplex transfers, mostly to reduce
         * per-transfer overheads (by making fewer transfers).
         */
-       if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
+       if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
                return -EINVAL;
 
        /* MMC and SD specs only seem to care that sampling is on the

diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
index 70bc7253454f6b6b2794684b2a9fdd9b430bc279..7c41623dac90023ffaee46b6cbb13cef97350da0 100644 (file)
--- a/drivers/net/ethernet/micrel/ks8851_spi.c
+++ b/drivers/net/ethernet/micrel/ks8851_spi.c
@@ -156,7 +156,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
 
        txb[0] = cpu_to_le16(op | KS_SPIOP_RD);
 
-       if (kss->spidev->master->flags & SPI_MASTER_HALF_DUPLEX) {
+       if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX) {
                msg = &kss->spi_msg2;
                xfer = kss->spi_xfer2;
 
@@ -180,7 +180,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
        ret = spi_sync(kss->spidev, msg);
        if (ret < 0)
                netdev_err(ks->netdev, "read: spi_sync() failed\n");
-       else if (kss->spidev->master->flags & SPI_MASTER_HALF_DUPLEX)
+       else if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
                memcpy(rxb, trx, rxl);
        else
                memcpy(rxb, trx + 2, rxl);

diff --git a/drivers/usb/gadget/udc/max3420_udc.c b/drivers/usb/gadget/udc/max3420_udc.c
index 2d57786d3db79ab472513e47355ec81b5d2b9d0c..89e8cf2a2a7da62ec163bd824c7e245b8580cf92 100644 (file)
--- a/drivers/usb/gadget/udc/max3420_udc.c
+++ b/drivers/usb/gadget/udc/max3420_udc.c
@@ -1201,7 +1201,7 @@ static int max3420_probe(struct spi_device *spi)
        int err, irq;
        u8 reg[8];
 
-       if (spi->master->flags & SPI_MASTER_HALF_DUPLEX) {
+       if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) {
                dev_err(&spi->dev, "UDC needs full duplex to work\n");
                return -EINVAL;
        }

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 255a0562aea5a868b4e3bd78ecd2497e8f3f105f..7b4baff63c5c0e90bdf657c8c0f6be44bdb9e99f 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -1638,8 +1638,6 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
 /* Compatibility layer */
 #define spi_master                     spi_controller
 
-#define SPI_MASTER_HALF_DUPLEX         SPI_CONTROLLER_HALF_DUPLEX
-
 #define spi_master_get_devdata(_ctlr)  spi_controller_get_devdata(_ctlr)
 #define spi_master_set_devdata(_ctlr, _data)   \
        spi_controller_set_devdata(_ctlr, _data)