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>

diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c
index 27b68dc79b181d4853204bf44a0a3142dc94d9c8..c82edda66b237faeb5430b978a9edf6500257e15 100644 (file)
--- a/drivers/input/rmi4/rmi_spi.c
+++ b/drivers/input/rmi4/rmi_spi.c
@@ -188,7 +188,8 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi,
                        memset(xfer, 0, sizeof(struct spi_transfer));
                        xfer->tx_buf = &rmi_spi->tx_buf[i];
                        xfer->len = 1;
-                       xfer->delay_usecs = spi_data->write_delay_us;
+                       xfer->delay.value = spi_data->write_delay_us;
+                       xfer->delay.unit = SPI_DELAY_UNIT_USECS;
                        spi_message_add_tail(xfer, &msg);
                }
        } else {
@@ -210,7 +211,8 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi,
                                memset(xfer, 0, sizeof(struct spi_transfer));
                                xfer->rx_buf = &rmi_spi->rx_buf[i];
                                xfer->len = 1;
-                               xfer->delay_usecs = spi_data->read_delay_us;
+                               xfer->delay.value = spi_data->read_delay_us;
+                               xfer->delay.unit = SPI_DELAY_UNIT_USECS;
                                spi_message_add_tail(xfer, &msg);
                        }
                } else {