Unverified Commit e74dc5c7 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Mark Brown
Browse files

spi: use new `spi_transfer_delay_exec` helper where straightforward



For many places in the spi drivers, using the new `spi_transfer_delay`
helper is straightforward.
It's just replacing:
```
  if (t->delay_usecs)
     udelay(t->delay_usecs);
```
with `spi_transfer_delay(t)` which handles both `delay_usecs` and the new
`delay` field.

This change replaces in all places (in the spi drivers)  where this change
is simple.

Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20190926105147.7839-10-alexandru.ardelean@analog.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent acc7720d
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -1366,8 +1366,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
		&& as->use_pdc)
		atmel_spi_dma_unmap_xfer(master, xfer);

	if (xfer->delay_usecs)
		udelay(xfer->delay_usecs);
	spi_transfer_delay_exec(xfer);

	if (xfer->cs_change) {
		if (list_is_last(&xfer->transfer_list,
+1 −2
Original line number Diff line number Diff line
@@ -291,8 +291,7 @@ static int bcm63xx_hsspi_transfer_one(struct spi_master *master,

		msg->actual_length += t->len;

		if (t->delay_usecs)
			udelay(t->delay_usecs);
		spi_transfer_delay_exec(t);

		if (t->cs_change)
			bcm63xx_hsspi_set_cs(bs, spi->chip_select, false);
+1 −2
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
			*rx_buf++ = (u8)v;
		}

	if (xfer->delay_usecs)
		udelay(xfer->delay_usecs);
	spi_transfer_delay_exec(xfer);

	return xfer->len;
}
+1 −2
Original line number Diff line number Diff line
@@ -827,8 +827,7 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,
			dev_err(&dspi->pdev->dev,
				"Waiting for transfer to complete failed!\n");

		if (transfer->delay_usecs)
			udelay(transfer->delay_usecs);
		spi_transfer_delay_exec(transfer);
	}

out:
+1 −2
Original line number Diff line number Diff line
@@ -427,8 +427,7 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans)

	ret = fsl_espi_bufs(spi, trans);

	if (trans->delay_usecs)
		udelay(trans->delay_usecs);
	spi_transfer_delay_exec(trans);

	return ret;
}
Loading