aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Ardelean <[email protected]>2021-03-08 14:54:53 +0000
committerMark Brown <[email protected]>2021-03-12 14:30:42 +0000
commit93c941448994a728e691f7dce9ea6475e352b09c (patch)
tree13a0009057d95a7e8d37cb63954971b5b304f0f0
parentspi: cadence-quadspi: Silence shiftTooManyBitsSigned warning (diff)
downloadkernel-93c941448994a728e691f7dce9ea6475e352b09c.tar.gz
kernel-93c941448994a728e691f7dce9ea6475e352b09c.zip
spi: spi-axi-spi-engine: remove usage of delay_usecs
The 'delay_usecs' field was handled for backwards compatibility in case there were some users that still configured SPI delay transfers with this field. They should all be removed by now. Signed-off-by: Alexandru Ardelean <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
-rw-r--r--drivers/spi/spi-axi-spi-engine.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index af86e6d6e16b..80c3e38f5c1b 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -170,14 +170,10 @@ static void spi_engine_gen_sleep(struct spi_engine_program *p, bool dry,
unsigned int t;
int delay;
- if (xfer->delay_usecs) {
- delay = xfer->delay_usecs;
- } else {
- delay = spi_delay_to_ns(&xfer->delay, xfer);
- if (delay < 0)
- return;
- delay /= 1000;
- }
+ delay = spi_delay_to_ns(&xfer->delay, xfer);
+ if (delay < 0)
+ return;
+ delay /= 1000;
if (delay == 0)
return;