Commit 3ab1cce5 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Mark Brown

spi: core: remove 'delay_usecs' field from spi_transfer

The 'delay' field in the spi_transfer struct is meant to replace the
'delay_usecs' field. However some cleanup was required to remove the
uses of 'delay_usecs'. Now that it's been cleaned up, we can remove it
from the kernel tree.
Signed-off-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210308145502.1075689-10-aardelean@deviqon.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 55a47532
...@@ -3178,7 +3178,6 @@ struct spi_replaced_transfers *spi_replace_transfers( ...@@ -3178,7 +3178,6 @@ struct spi_replaced_transfers *spi_replace_transfers(
/* clear cs_change and delay for all but the last */ /* clear cs_change and delay for all but the last */
if (i) { if (i) {
xfer->cs_change = false; xfer->cs_change = false;
xfer->delay_usecs = 0;
xfer->delay.value = 0; xfer->delay.value = 0;
} }
} }
......
...@@ -832,9 +832,6 @@ extern void spi_res_release(struct spi_controller *ctlr, ...@@ -832,9 +832,6 @@ extern void spi_res_release(struct spi_controller *ctlr,
* @delay: delay to be introduced after this transfer before * @delay: delay to be introduced after this transfer before
* (optionally) changing the chipselect status, then starting * (optionally) changing the chipselect status, then starting
* the next transfer or completing this @spi_message. * the next transfer or completing this @spi_message.
* @delay_usecs: microseconds to delay after this transfer before
* (optionally) changing the chipselect status, then starting
* the next transfer or completing this @spi_message.
* @word_delay: inter word delay to be introduced after each word size * @word_delay: inter word delay to be introduced after each word size
* (set by bits_per_word) transmission. * (set by bits_per_word) transmission.
* @effective_speed_hz: the effective SCK-speed that was used to * @effective_speed_hz: the effective SCK-speed that was used to
...@@ -946,7 +943,6 @@ struct spi_transfer { ...@@ -946,7 +943,6 @@ struct spi_transfer {
#define SPI_NBITS_DUAL 0x02 /* 2bits transfer */ #define SPI_NBITS_DUAL 0x02 /* 2bits transfer */
#define SPI_NBITS_QUAD 0x04 /* 4bits transfer */ #define SPI_NBITS_QUAD 0x04 /* 4bits transfer */
u8 bits_per_word; u8 bits_per_word;
u16 delay_usecs;
struct spi_delay delay; struct spi_delay delay;
struct spi_delay cs_change_delay; struct spi_delay cs_change_delay;
struct spi_delay word_delay; struct spi_delay word_delay;
...@@ -1060,14 +1056,6 @@ spi_transfer_del(struct spi_transfer *t) ...@@ -1060,14 +1056,6 @@ spi_transfer_del(struct spi_transfer *t)
static inline int static inline int
spi_transfer_delay_exec(struct spi_transfer *t) spi_transfer_delay_exec(struct spi_transfer *t)
{ {
struct spi_delay d;
if (t->delay_usecs) {
d.value = t->delay_usecs;
d.unit = SPI_DELAY_UNIT_USECS;
return spi_delay_exec(&d, NULL);
}
return spi_delay_exec(&t->delay, t); return spi_delay_exec(&t->delay, t);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment