]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Input: ad7877 - use new structure for SPI transfer delays
authorSergiu Cuciurean <sergiu.cuciurean@analog.com>
Fri, 11 Dec 2020 05:55:31 +0000 (21:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 11 Dec 2020 07:39:15 +0000 (23:39 -0800)
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/20200228104508.15564-1-sergiu.cuciurean@analog.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/ad7877.c

index 9b652f61837f50a45fb6616bcf87fd370fccf940..08f5372f0bfde165b126ac169659a9544e44133e 100644 (file)
@@ -281,12 +281,14 @@ static int ad7877_read_adc(struct spi_device *spi, unsigned command)
 
        req->xfer[1].tx_buf = &req->ref_on;
        req->xfer[1].len = 2;
-       req->xfer[1].delay_usecs = ts->vref_delay_usecs;
+       req->xfer[1].delay.value = ts->vref_delay_usecs;
+       req->xfer[1].delay.unit = SPI_DELAY_UNIT_USECS;
        req->xfer[1].cs_change = 1;
 
        req->xfer[2].tx_buf = &req->command;
        req->xfer[2].len = 2;
-       req->xfer[2].delay_usecs = ts->vref_delay_usecs;
+       req->xfer[2].delay.value = ts->vref_delay_usecs;
+       req->xfer[2].delay.unit = SPI_DELAY_UNIT_USECS;
        req->xfer[2].cs_change = 1;
 
        req->xfer[3].rx_buf = &req->sample;