tpm_tis_spi: use new 'delay' structure for SPI transfer delays

In a recent change to the SPI subsystem [1], a new 'delay' struct was added
to replace the 'delay_usecs'. This change replaces the current
'delay_usecs' with 'delay' for this driver.

The 'spi_transfer_delay_exec()' function [in the SPI framework] makes sure
that both 'delay_usecs' & 'delay' are used (in this order to preserve
backwards compatibility).

[1] commit bebcfd272df6485 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
index d1754fd6c5734022eb5520ab7baf37f07645e925..d967559355296e1164ab72c39a08bd9709bfc770 100644 (file)
--- a/drivers/char/tpm/tpm_tis_spi_main.c
+++ b/drivers/char/tpm/tpm_tis_spi_main.c
@@ -110,7 +110,8 @@ int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u16 len,
 
                spi_xfer.cs_change = 0;
                spi_xfer.len = transfer_len;
-               spi_xfer.delay_usecs = 5;
+               spi_xfer.delay.value = 5;
+               spi_xfer.delay.unit = SPI_DELAY_UNIT_USECS;
 
                if (in) {
                        spi_xfer.tx_buf = NULL;