spi: Get rid of old SPI_MASTER_NO_TX & SPI_MASTER_NO_RX
Convert the users from SPI_MASTER_NO_TX and/or SPI_MASTER_NO_RX to SPI_CONTROLLER_NO_TX and/or SPI_CONTROLLER_NO_RX respectively and kill the not used anymore definitions. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230710154932.68377-12-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko
Mark Brown
Родитель
edf6a864c9
Коммит
c397f09e54
|
|
@ -57,7 +57,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi,
|
|||
for (word <<= (32 - bits); likely(bits); bits--) {
|
||||
|
||||
/* setup MSB (to slave) on trailing edge */
|
||||
if ((flags & SPI_MASTER_NO_TX) == 0) {
|
||||
if ((flags & SPI_CONTROLLER_NO_TX) == 0) {
|
||||
if ((word & (1 << 31)) != oldbit) {
|
||||
setmosi(spi, word & (1 << 31));
|
||||
oldbit = word & (1 << 31);
|
||||
|
|
@ -70,7 +70,7 @@ bitbang_txrx_be_cpha0(struct spi_device *spi,
|
|||
|
||||
/* sample MSB (from slave) on leading edge */
|
||||
word <<= 1;
|
||||
if ((flags & SPI_MASTER_NO_RX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
|
||||
word |= getmiso(spi);
|
||||
setsck(spi, cpol);
|
||||
}
|
||||
|
|
@ -90,7 +90,7 @@ bitbang_txrx_be_cpha1(struct spi_device *spi,
|
|||
|
||||
/* setup MSB (to slave) on leading edge */
|
||||
setsck(spi, !cpol);
|
||||
if ((flags & SPI_MASTER_NO_TX) == 0) {
|
||||
if ((flags & SPI_CONTROLLER_NO_TX) == 0) {
|
||||
if ((word & (1 << 31)) != oldbit) {
|
||||
setmosi(spi, word & (1 << 31));
|
||||
oldbit = word & (1 << 31);
|
||||
|
|
@ -103,7 +103,7 @@ bitbang_txrx_be_cpha1(struct spi_device *spi,
|
|||
|
||||
/* sample MSB (from slave) on trailing edge */
|
||||
word <<= 1;
|
||||
if ((flags & SPI_MASTER_NO_RX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
|
||||
word |= getmiso(spi);
|
||||
}
|
||||
return word;
|
||||
|
|
@ -122,7 +122,7 @@ bitbang_txrx_le_cpha0(struct spi_device *spi,
|
|||
for (; likely(bits); bits--) {
|
||||
|
||||
/* setup LSB (to slave) on trailing edge */
|
||||
if ((flags & SPI_MASTER_NO_TX) == 0) {
|
||||
if ((flags & SPI_CONTROLLER_NO_TX) == 0) {
|
||||
if ((word & 1) != oldbit) {
|
||||
setmosi(spi, word & 1);
|
||||
oldbit = word & 1;
|
||||
|
|
@ -135,7 +135,7 @@ bitbang_txrx_le_cpha0(struct spi_device *spi,
|
|||
|
||||
/* sample LSB (from slave) on leading edge */
|
||||
word >>= 1;
|
||||
if ((flags & SPI_MASTER_NO_RX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
|
||||
word |= getmiso(spi) << rxbit;
|
||||
setsck(spi, cpol);
|
||||
}
|
||||
|
|
@ -156,7 +156,7 @@ bitbang_txrx_le_cpha1(struct spi_device *spi,
|
|||
|
||||
/* setup LSB (to slave) on leading edge */
|
||||
setsck(spi, !cpol);
|
||||
if ((flags & SPI_MASTER_NO_TX) == 0) {
|
||||
if ((flags & SPI_CONTROLLER_NO_TX) == 0) {
|
||||
if ((word & 1) != oldbit) {
|
||||
setmosi(spi, word & 1);
|
||||
oldbit = word & 1;
|
||||
|
|
@ -169,7 +169,7 @@ bitbang_txrx_le_cpha1(struct spi_device *spi,
|
|||
|
||||
/* sample LSB (from slave) on trailing edge */
|
||||
word >>= 1;
|
||||
if ((flags & SPI_MASTER_NO_RX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
|
||||
word |= getmiso(spi) << rxbit;
|
||||
}
|
||||
return word;
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t)
|
|||
if (spi->mode & SPI_3WIRE) {
|
||||
unsigned flags;
|
||||
|
||||
flags = t->tx_buf ? SPI_MASTER_NO_RX : SPI_MASTER_NO_TX;
|
||||
flags = t->tx_buf ? SPI_CONTROLLER_NO_RX : SPI_CONTROLLER_NO_TX;
|
||||
return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t, flags);
|
||||
}
|
||||
return cs->txrx_bufs(spi, cs->txrx_word, nsecs, t, 0);
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ static u32 spi_gpio_txrx_word_mode3(struct spi_device *spi,
|
|||
|
||||
/*
|
||||
* These functions do not call setmosi or getmiso if respective flag
|
||||
* (SPI_MASTER_NO_RX or SPI_MASTER_NO_TX) is set, so they are safe to
|
||||
* (SPI_CONTROLLER_NO_RX or SPI_CONTROLLER_NO_TX) is set, so they are safe to
|
||||
* call when such pin is not present or defined in the controller.
|
||||
* A separate set of callbacks is defined to get highest possible
|
||||
* speed in the generic case (when both MISO and MOSI lines are
|
||||
|
|
@ -416,11 +416,11 @@ static int spi_gpio_probe(struct platform_device *pdev)
|
|||
if (!spi_gpio->mosi) {
|
||||
/* HW configuration without MOSI pin
|
||||
*
|
||||
* No setting SPI_MASTER_NO_RX here - if there is only
|
||||
* No setting SPI_CONTROLLER_NO_RX here - if there is only
|
||||
* a MOSI pin connected the host can still do RX by
|
||||
* changing the direction of the line.
|
||||
*/
|
||||
master->flags = SPI_MASTER_NO_TX;
|
||||
master->flags = SPI_CONTROLLER_NO_TX;
|
||||
}
|
||||
|
||||
master->bus_num = pdev->id;
|
||||
|
|
@ -438,7 +438,7 @@ static int spi_gpio_probe(struct platform_device *pdev)
|
|||
bb->chipselect = spi_gpio_chipselect;
|
||||
bb->set_line_direction = spi_gpio_set_direction;
|
||||
|
||||
if (master->flags & SPI_MASTER_NO_TX) {
|
||||
if (master->flags & SPI_CONTROLLER_NO_TX) {
|
||||
bb->txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;
|
||||
bb->txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;
|
||||
bb->txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;
|
||||
|
|
|
|||
|
|
@ -75,14 +75,14 @@ bitbang_txrx_be_cpha0_lsb(struct spi_lp8841_rtc *data,
|
|||
for (; likely(bits); bits--) {
|
||||
|
||||
/* setup LSB (to slave) on leading edge */
|
||||
if ((flags & SPI_MASTER_NO_TX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_TX) == 0)
|
||||
setmosi(data, (word & 1));
|
||||
|
||||
usleep_range(usecs, usecs + 1); /* T(setup) */
|
||||
|
||||
/* sample LSB (from slave) on trailing edge */
|
||||
word >>= 1;
|
||||
if ((flags & SPI_MASTER_NO_RX) == 0)
|
||||
if ((flags & SPI_CONTROLLER_NO_RX) == 0)
|
||||
word |= (getmiso(data) << 31);
|
||||
|
||||
setsck(data, !cpol);
|
||||
|
|
@ -113,7 +113,7 @@ spi_lp8841_rtc_transfer_one(struct spi_master *master,
|
|||
while (likely(count > 0)) {
|
||||
word = *tx++;
|
||||
bitbang_txrx_be_cpha0_lsb(data, 1, 0,
|
||||
SPI_MASTER_NO_RX, word, 8);
|
||||
SPI_CONTROLLER_NO_RX, word, 8);
|
||||
count--;
|
||||
}
|
||||
} else if (rx) {
|
||||
|
|
@ -121,7 +121,7 @@ spi_lp8841_rtc_transfer_one(struct spi_master *master,
|
|||
writeb(data->state, data->iomem);
|
||||
while (likely(count > 0)) {
|
||||
word = bitbang_txrx_be_cpha0_lsb(data, 1, 0,
|
||||
SPI_MASTER_NO_TX, word, 8);
|
||||
SPI_CONTROLLER_NO_TX, word, 8);
|
||||
*rx++ = word;
|
||||
count--;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ static int xtfpga_spi_probe(struct platform_device *pdev)
|
|||
if (!master)
|
||||
return -ENOMEM;
|
||||
|
||||
master->flags = SPI_MASTER_NO_RX;
|
||||
master->flags = SPI_CONTROLLER_NO_RX;
|
||||
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
|
||||
master->bus_num = pdev->dev.id;
|
||||
master->dev.of_node = pdev->dev.of_node;
|
||||
|
|
|
|||
|
|
@ -1623,8 +1623,6 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer)
|
|||
#define spi_master spi_controller
|
||||
|
||||
#define SPI_MASTER_HALF_DUPLEX SPI_CONTROLLER_HALF_DUPLEX
|
||||
#define SPI_MASTER_NO_RX SPI_CONTROLLER_NO_RX
|
||||
#define SPI_MASTER_NO_TX SPI_CONTROLLER_NO_TX
|
||||
#define SPI_MASTER_MUST_RX SPI_CONTROLLER_MUST_RX
|
||||
#define SPI_MASTER_MUST_TX SPI_CONTROLLER_MUST_TX
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче