diff options
| author | Alexandru Ardelean <alexandru.ardelean@analog.com> | 2019-09-26 13:51:29 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-15 11:41:04 +0100 |
| commit | 6b3f236a998550dba91a46a22feb1cc02f39fb06 (patch) | |
| tree | c3bc0b27325890de6fb5736563ff7ec3f17c63d2 /drivers/spi | |
| parent | 97f41c68b83ea5216dbf3ac51fd86b0fbd399a97 (diff) | |
| download | linux-stable-6b3f236a998550dba91a46a22feb1cc02f39fb06.tar.gz linux-stable-6b3f236a998550dba91a46a22feb1cc02f39fb06.tar.bz2 linux-stable-6b3f236a998550dba91a46a22feb1cc02f39fb06.zip | |
spi: move `cs_change_delay` backwards compat logic outside switch
The `cs_change_delay` backwards compatibility value could be moved outside
of the switch statement.
The only reason to do it, is to make the next patches easier to diff.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20190926105147.7839-2-alexandru.ardelean@analog.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9bb36c32cbf9..7ba981cdb86b 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1114,16 +1114,15 @@ static void _spi_transfer_cs_change_delay(struct spi_message *msg, u32 hz; /* return early on "fast" mode - for everything but USECS */ - if (!delay && unit != SPI_DELAY_UNIT_USECS) + if (!delay) { + if (unit == SPI_DELAY_UNIT_USECS) + _spi_transfer_delay_ns(10000); return; + } switch (unit) { case SPI_DELAY_UNIT_USECS: - /* for compatibility use default of 10us */ - if (!delay) - delay = 10000; - else - delay *= 1000; + delay *= 1000; break; case SPI_DELAY_UNIT_NSECS: /* nothing to do here */ break; |