diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2023-06-22 11:06:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-06-22 23:22:54 +0200 |
| commit | 6eef895581c9b5fcd002ff77837e0c3a4b1eecf6 (patch) | |
| tree | a6e1461650d482a259865f87ec236093fe47e15b /drivers/spi | |
| parent | spi: atmel: Prevent false timeouts on long transfers (diff) | |
| download | linux-6eef895581c9b5fcd002ff77837e0c3a4b1eecf6.tar.xz linux-6eef895581c9b5fcd002ff77837e0c3a4b1eecf6.zip | |
spi: sun6i: Use the new helper to derive the xfer timeout value
A helper was recently added to the core to factorize common code between
drivers, like the amount of time a driver should wait for a transfer to
happen.
It is of course possible to use a default value (like eg. 1s) but it is
way stronger to adapt this amount of time to the transfer. Indeed, long
transfers (eg. 4MiB) on a slow single-spi bus might take more than the
usual second of timeout and prevent lengthy transfers.
The core helper was heavily inspired by the logic applied in this
driver, the only difference being the minimum amount of time which was
enlarged from 0.1s to 0.5s.
Use this helper instead of open-coding it.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Jernej Škrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/Message-Id: <20230622090634.3411468-4-miquel.raynal@bootlin.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sun6i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index 02a3a4f2b3a0..30d541612253 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -455,7 +455,7 @@ static int sun6i_spi_transfer_one(struct spi_master *master, reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG); sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg | SUN6I_TFR_CTL_XCH); - tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U); + tx_time = spi_controller_xfer_timeout(master, tfr); start = jiffies; timeout = wait_for_completion_timeout(&sspi->done, msecs_to_jiffies(tx_time)); |