spi: tegra114: Remove unnecessary NULL-pointer checks
cs_setup, cs_hold and cs_inactive points to fields of spi_device struct,
so there is no sense in checking them for NULL.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: 04e6bb0d6b
("spi: modify set_cs_timing parameter")
Signed-off-by: Alexander Danilenko <al.b.danilenko@gmail.com>
Link: https://lore.kernel.org/r/20230815092058.4083-1-al.b.danilenko@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
f5b19425cd
Коммит
373c36bf79
|
@ -722,27 +722,23 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi)
|
|||
struct spi_delay *setup = &spi->cs_setup;
|
||||
struct spi_delay *hold = &spi->cs_hold;
|
||||
struct spi_delay *inactive = &spi->cs_inactive;
|
||||
u8 setup_dly, hold_dly, inactive_dly;
|
||||
u8 setup_dly, hold_dly;
|
||||
u32 setup_hold;
|
||||
u32 spi_cs_timing;
|
||||
u32 inactive_cycles;
|
||||
u8 cs_state;
|
||||
|
||||
if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) ||
|
||||
(hold && hold->unit != SPI_DELAY_UNIT_SCK) ||
|
||||
(inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) {
|
||||
if (setup->unit != SPI_DELAY_UNIT_SCK ||
|
||||
hold->unit != SPI_DELAY_UNIT_SCK ||
|
||||
inactive->unit != SPI_DELAY_UNIT_SCK) {
|
||||
dev_err(&spi->dev,
|
||||
"Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n",
|
||||
SPI_DELAY_UNIT_SCK);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
setup_dly = setup ? setup->value : 0;
|
||||
hold_dly = hold ? hold->value : 0;
|
||||
inactive_dly = inactive ? inactive->value : 0;
|
||||
|
||||
setup_dly = min_t(u8, setup_dly, MAX_SETUP_HOLD_CYCLES);
|
||||
hold_dly = min_t(u8, hold_dly, MAX_SETUP_HOLD_CYCLES);
|
||||
setup_dly = min_t(u8, setup->value, MAX_SETUP_HOLD_CYCLES);
|
||||
hold_dly = min_t(u8, hold->value, MAX_SETUP_HOLD_CYCLES);
|
||||
if (setup_dly && hold_dly) {
|
||||
setup_hold = SPI_SETUP_HOLD(setup_dly - 1, hold_dly - 1);
|
||||
spi_cs_timing = SPI_CS_SETUP_HOLD(tspi->spi_cs_timing1,
|
||||
|
@ -754,7 +750,7 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi)
|
|||
}
|
||||
}
|
||||
|
||||
inactive_cycles = min_t(u8, inactive_dly, MAX_INACTIVE_CYCLES);
|
||||
inactive_cycles = min_t(u8, inactive->value, MAX_INACTIVE_CYCLES);
|
||||
if (inactive_cycles)
|
||||
inactive_cycles--;
|
||||
cs_state = inactive_cycles ? 0 : 1;
|
||||
|
|
Загрузка…
Ссылка в новой задаче