Commit 204c7b3c authored Feb 27, 2020 by Sergiu Cuciurean Committed by Mauro Carvalho Chehab Mar 05, 2020

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 bebcfd27 ("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>

parent aead0ffb

drivers/media/spi/gs1662.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -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
		},
		},
		};