Skip to content

Commit 3fc6350

Browse files
andy-shevbroonie
authored andcommitted
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>
1 parent 6f9da18 commit 3fc6350

5 files changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/input/rmi4/rmi_spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi)
375375
struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data;
376376
int error;
377377

378-
if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
378+
if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
379379
return -EINVAL;
380380

381381
rmi_spi = devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport),

drivers/mmc/host/mmc_spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ static int mmc_spi_probe(struct spi_device *spi)
13221322
/* We rely on full duplex transfers, mostly to reduce
13231323
* per-transfer overheads (by making fewer transfers).
13241324
*/
1325-
if (spi->master->flags & SPI_MASTER_HALF_DUPLEX)
1325+
if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
13261326
return -EINVAL;
13271327

13281328
/* MMC and SD specs only seem to care that sampling is on the

drivers/net/ethernet/micrel/ks8851_spi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
156156

157157
txb[0] = cpu_to_le16(op | KS_SPIOP_RD);
158158

159-
if (kss->spidev->master->flags & SPI_MASTER_HALF_DUPLEX) {
159+
if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX) {
160160
msg = &kss->spi_msg2;
161161
xfer = kss->spi_xfer2;
162162

@@ -180,7 +180,7 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned int op,
180180
ret = spi_sync(kss->spidev, msg);
181181
if (ret < 0)
182182
netdev_err(ks->netdev, "read: spi_sync() failed\n");
183-
else if (kss->spidev->master->flags & SPI_MASTER_HALF_DUPLEX)
183+
else if (kss->spidev->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
184184
memcpy(rxb, trx, rxl);
185185
else
186186
memcpy(rxb, trx + 2, rxl);

drivers/usb/gadget/udc/max3420_udc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ static int max3420_probe(struct spi_device *spi)
12011201
int err, irq;
12021202
u8 reg[8];
12031203

1204-
if (spi->master->flags & SPI_MASTER_HALF_DUPLEX) {
1204+
if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) {
12051205
dev_err(&spi->dev, "UDC needs full duplex to work\n");
12061206
return -EINVAL;
12071207
}

include/linux/spi/spi.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,8 +1638,6 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
16381638
/* Compatibility layer */
16391639
#define spi_master spi_controller
16401640

1641-
#define SPI_MASTER_HALF_DUPLEX SPI_CONTROLLER_HALF_DUPLEX
1642-
16431641
#define spi_master_get_devdata(_ctlr) spi_controller_get_devdata(_ctlr)
16441642
#define spi_master_set_devdata(_ctlr, _data) \
16451643
spi_controller_set_devdata(_ctlr, _data)

0 commit comments

Comments
 (0)