media: spi: gs1662: 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>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c
index d789d82df7c4c5cd0eed8432d519409603db1ab1..f86ef1ca12885743791b15e756d4e8d9d7346941 100644 (file)
--- a/drivers/media/spi/gs1662.c
+++ b/drivers/media/spi/gs1662.c
@@ -147,11 +147,17 @@ static int gs_read_register(struct spi_device *spi, u16 addr, u16 *value)
                {
                        .tx_buf = &buf_addr,
                        .len = 2,
-                       .delay_usecs = 1,
+                       .delay = {
+                               .value = 1,
+                               .unit = SPI_DELAY_UNIT_USECS
+                       },
                }, {
                        .rx_buf = &buf_value,
                        .len = 2,
-                       .delay_usecs = 1,
+                       .delay = {
+                               .value = 1,
+                               .unit = SPI_DELAY_UNIT_USECS
+                       },
                },
        };
 
@@ -175,11 +181,17 @@ static int gs_write_register(struct spi_device *spi, u16 addr, u16 value)
                {
                        .tx_buf = &buf_addr,
                        .len = 2,
-                       .delay_usecs = 1,
+                       .delay = {
+                               .value = 1,
+                               .unit = SPI_DELAY_UNIT_USECS
+                       },
                }, {
                        .tx_buf = &buf_value,
                        .len = 2,
-                       .delay_usecs = 1,
+                       .delay = {
+                               .value = 1,
+                               .unit = SPI_DELAY_UNIT_USECS
+                       },
                },
        };