Skip to content

Commit 6eef895

Browse files
miquelraynalbroonie
authored andcommitted
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 <[email protected]> Acked-by: Jernej Škrabec <[email protected]> Link: https://lore.kernel.org/r/Message-Id: <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent e0205d6 commit 6eef895

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/spi/spi-sun6i.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ static int sun6i_spi_transfer_one(struct spi_master *master,
455455
reg = sun6i_spi_read(sspi, SUN6I_TFR_CTL_REG);
456456
sun6i_spi_write(sspi, SUN6I_TFR_CTL_REG, reg | SUN6I_TFR_CTL_XCH);
457457

458-
tx_time = max(tfr->len * 8 * 2 / (tfr->speed_hz / 1000), 100U);
458+
tx_time = spi_controller_xfer_timeout(master, tfr);
459459
start = jiffies;
460460
timeout = wait_for_completion_timeout(&sspi->done,
461461
msecs_to_jiffies(tx_time));

0 commit comments

Comments
 (0)