diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 20:56:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 20:56:35 +0100 |
| commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
| tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spi-omap-100k.c | |
| parent | Merge branch 'spi-5.4' into spi-linus (diff) | |
| parent | dt-bindings: spi: Convert stm32 QSPI bindings to json-schema (diff) | |
| download | linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.xz linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.zip | |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-omap-100k.c')
| -rw-r--r-- | drivers/spi/spi-omap-100k.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index b955ca8796d2..5c704ba6d8ea 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c @@ -128,7 +128,7 @@ static void spi100k_write_data(struct spi_master *master, int len, int data) static int spi100k_read_data(struct spi_master *master, int len) { - int dataH, dataL; + int dataL; struct omap1_spi100k *spi100k = spi_master_get_devdata(master); /* Always do at least 16 bits */ @@ -146,7 +146,7 @@ static int spi100k_read_data(struct spi_master *master, int len) udelay(1000); dataL = readw(spi100k->base + SPI_RX_LSB); - dataH = readw(spi100k->base + SPI_RX_MSB); + readw(spi100k->base + SPI_RX_MSB); spi100k_disable_clock(master); return dataL; @@ -321,8 +321,7 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master, } } - if (t->delay_usecs) - udelay(t->delay_usecs); + spi_transfer_delay_exec(t); /* ignore the "leave it on after last xfer" hint */ |