Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: synaptics-rmi4 - 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@analog.com>
Link: https://lore.kernel.org/r/20200227130336.27042-1-sergiu.cuciurean@analog.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Sergiu Cuciurean and committed by
Dmitry Torokhov
9db5fbe1 6782b5da

+4 -2
+4 -2
drivers/input/rmi4/rmi_spi.c
··· 188 188 memset(xfer, 0, sizeof(struct spi_transfer)); 189 189 xfer->tx_buf = &rmi_spi->tx_buf[i]; 190 190 xfer->len = 1; 191 - xfer->delay_usecs = spi_data->write_delay_us; 191 + xfer->delay.value = spi_data->write_delay_us; 192 + xfer->delay.unit = SPI_DELAY_UNIT_USECS; 192 193 spi_message_add_tail(xfer, &msg); 193 194 } 194 195 } else { ··· 211 210 memset(xfer, 0, sizeof(struct spi_transfer)); 212 211 xfer->rx_buf = &rmi_spi->rx_buf[i]; 213 212 xfer->len = 1; 214 - xfer->delay_usecs = spi_data->read_delay_us; 213 + xfer->delay.value = spi_data->read_delay_us; 214 + xfer->delay.unit = SPI_DELAY_UNIT_USECS; 215 215 spi_message_add_tail(xfer, &msg); 216 216 } 217 217 } else {