[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200227140634.9286-1-sergiu.cuciurean@analog.com>
Date: Thu, 27 Feb 2020 16:06:34 +0200
From: Sergiu Cuciurean <sergiu.cuciurean@...log.com>
To: <linux-kernel@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-wireless@...r.kernel.org>,
<libertas-dev@...ts.infradead.org>, <kvalo@...eaurora.org>,
<davem@...emloft.net>, <gregkh@...uxfoundation.org>
CC: <dcbw@...hat.com>, <allison@...utok.net>, <tglx@...utronix.de>,
Sergiu Cuciurean <sergiu.cuciurean@...log.com>
Subject: [PATCH] net: wireless: marvell: libertas: Use new 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 bebcfd272df6 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@...log.com>
---
drivers/net/wireless/marvell/libertas/if_spi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c
index d07fe82c557e..3c3f266bf116 100644
--- a/drivers/net/wireless/marvell/libertas/if_spi.c
+++ b/drivers/net/wireless/marvell/libertas/if_spi.c
@@ -235,8 +235,9 @@ static int spu_read(struct if_spi_card *card, u16 reg, u8 *buf, int len)
spi_message_add_tail(&dummy_trans, &m);
} else {
/* Busy-wait while the SPU fills the FIFO */
- reg_trans.delay_usecs =
+ reg_trans.delay.value =
DIV_ROUND_UP((100 + (delay * 10)), 1000);
+ reg_trans.delay.unit = SPI_DELAY_UNIT_USECS;
}
/* read in data */
--
2.17.1
Powered by blists - more mailing lists