Commit b26b1391 authored by Sergiu Cuciurean's avatar Sergiu Cuciurean Committed by Greg Kroah-Hartman

staging: wilc1000: spi: Use new structure for SPI transfer delays

In a recent change to the SPI subsystem in commit <bebcfd27>
("spi: introduce `delay` field for `spi_transfer` +
spi_transfer_delay_exec()"), 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).
Signed-off-by: default avatarSergiu Cuciurean <sergiu.cuciurean@analog.com>
Link: https://lore.kernel.org/r/20200304074319.22107-1-sergiu.cuciurean@analog.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19a91ec8
...@@ -228,7 +228,10 @@ static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len) ...@@ -228,7 +228,10 @@ static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)
struct spi_transfer tr = { struct spi_transfer tr = {
.tx_buf = b, .tx_buf = b,
.len = len, .len = len,
.delay_usecs = 0, .delay = {
.value = 0,
.unit = SPI_DELAY_UNIT_USECS
},
}; };
char *r_buffer = kzalloc(len, GFP_KERNEL); char *r_buffer = kzalloc(len, GFP_KERNEL);
...@@ -269,7 +272,10 @@ static int wilc_spi_rx(struct wilc *wilc, u8 *rb, u32 rlen) ...@@ -269,7 +272,10 @@ static int wilc_spi_rx(struct wilc *wilc, u8 *rb, u32 rlen)
struct spi_transfer tr = { struct spi_transfer tr = {
.rx_buf = rb, .rx_buf = rb,
.len = rlen, .len = rlen,
.delay_usecs = 0, .delay = {
.value = 0,
.unit = SPI_DELAY_UNIT_USECS
},
}; };
char *t_buffer = kzalloc(rlen, GFP_KERNEL); char *t_buffer = kzalloc(rlen, GFP_KERNEL);
...@@ -311,7 +317,10 @@ static int wilc_spi_tx_rx(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen) ...@@ -311,7 +317,10 @@ static int wilc_spi_tx_rx(struct wilc *wilc, u8 *wb, u8 *rb, u32 rlen)
.tx_buf = wb, .tx_buf = wb,
.len = rlen, .len = rlen,
.bits_per_word = 8, .bits_per_word = 8,
.delay_usecs = 0, .delay = {
.value = 0,
.unit = SPI_DELAY_UNIT_USECS
},
}; };
......
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