Unverified Commit 90366cd6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: Get rid of old SPI_MASTER_MUST_TX & SPI_MASTER_MUST_RX 



Convert the users from SPI_MASTER_MUST_TX and/or SPI_MASTER_MUST_RX
to SPI_CONTROLLER_MUST_TX and/or SPI_CONTROLLER_MUST_RX respectively
and kill the not used anymore definitions.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-13-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c397f09e

drivers/spi/spi-at91-usart.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int at91_usart_spi_probe(struct platform_device *pdev) 
	controller->dev.of_node = pdev->dev.parent->of_node;

	controller->bits_per_word_mask = SPI_BPW_MASK(8);

	controller->setup = at91_usart_spi_setup;

	controller->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;

	controller->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;

	controller->transfer_one = at91_usart_spi_transfer_one;

	controller->prepare_message = at91_usart_spi_prepare_message;

	controller->unprepare_message = at91_usart_spi_unprepare_message;

drivers/spi/spi-atmel.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int atmel_spi_probe(struct platform_device *pdev) 
	host->bus_num = pdev->id;

	host->num_chipselect = 4;

	host->setup = atmel_spi_setup;

	host->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX |

	host->flags = (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX |

			SPI_MASTER_GPIO_SS);

	host->transfer_one = atmel_spi_one_transfer;

	host->set_cs = atmel_spi_set_cs;

drivers/spi/spi-davinci.c

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ static int davinci_spi_probe(struct platform_device *pdev) 
	master->bus_num = pdev->id;

	master->num_chipselect = pdata->num_chipselect;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 16);

	master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_GPIO_SS;

	master->flags = SPI_CONTROLLER_MUST_RX | SPI_MASTER_GPIO_SS;

	master->setup = davinci_spi_setup;

	master->cleanup = davinci_spi_cleanup;

	master->can_dma = davinci_spi_can_dma;

drivers/spi/spi-fsl-lpspi.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) 
	controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware;

	controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware;

	controller->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

	controller->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;

	controller->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;

	controller->dev.of_node = pdev->dev.of_node;

	controller->bus_num = pdev->id;

	controller->num_chipselect = fsl_lpspi->num_cs;

drivers/spi/spi-meson-spicc.c

+1 −1
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static int meson_spicc_probe(struct platform_device *pdev) 
				     SPI_BPW_MASK(24) |

				     SPI_BPW_MASK(16) |

				     SPI_BPW_MASK(8);

	master->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX);

	master->flags = (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX);

	master->min_speed_hz = spicc->data->min_speed_hz;

	master->max_speed_hz = spicc->data->max_speed_hz;

	master->setup = meson_spicc_setup;