Commit cd13152b authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Mark Brown

spi: tegra114: use `spi_transfer_delay_exec` helper

The tegra114 driver has a weird/separate `tegra_spi_transfer_delay()`
function that does 2 delays: one mdelay() and one udelay().

This was introduced via commit f4fade12
("spi/tegra114: Correct support for cs_change").

There doesn't seem to be a mention in that commit message to suggest a
specific need/use-case for having the 2 delay calls.
For the most part, udelay() should be sufficient.

This change replaces it with the new `spi_transfer_delay_exec()`, which
should do the same thing.
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20190926105147.7839-11-alexandru.ardelean@analog.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bebcfd27
...@@ -984,17 +984,6 @@ static int tegra_spi_setup(struct spi_device *spi) ...@@ -984,17 +984,6 @@ static int tegra_spi_setup(struct spi_device *spi)
return 0; return 0;
} }
static void tegra_spi_transfer_delay(int delay)
{
if (!delay)
return;
if (delay >= 1000)
mdelay(delay / 1000);
udelay(delay % 1000);
}
static void tegra_spi_transfer_end(struct spi_device *spi) static void tegra_spi_transfer_end(struct spi_device *spi)
{ {
struct tegra_spi_data *tspi = spi_master_get_devdata(spi->master); struct tegra_spi_data *tspi = spi_master_get_devdata(spi->master);
...@@ -1098,7 +1087,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, ...@@ -1098,7 +1087,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
complete_xfer: complete_xfer:
if (ret < 0 || skip) { if (ret < 0 || skip) {
tegra_spi_transfer_end(spi); tegra_spi_transfer_end(spi);
tegra_spi_transfer_delay(xfer->delay_usecs); spi_transfer_delay_exec(xfer);
goto exit; goto exit;
} else if (list_is_last(&xfer->transfer_list, } else if (list_is_last(&xfer->transfer_list,
&msg->transfers)) { &msg->transfers)) {
...@@ -1106,11 +1095,11 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, ...@@ -1106,11 +1095,11 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
tspi->cs_control = spi; tspi->cs_control = spi;
else { else {
tegra_spi_transfer_end(spi); tegra_spi_transfer_end(spi);
tegra_spi_transfer_delay(xfer->delay_usecs); spi_transfer_delay_exec(xfer);
} }
} else if (xfer->cs_change) { } else if (xfer->cs_change) {
tegra_spi_transfer_end(spi); tegra_spi_transfer_end(spi);
tegra_spi_transfer_delay(xfer->delay_usecs); spi_transfer_delay_exec(xfer);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment