niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

spi: amd: Drop redundant check

Browse source 
Both spi and spi-mem cores already take care of checking the minimum and
maximum speed for transfers depending on the controller
capabilities. There is no reason to repeat this check in controller
drivers.

Once this possible error condition removed from the function, it makes
no longer sense to return an int.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-4-ad218dbc406f@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Miquel Raynal 2024-12-24 18:05:49 +01:00 • committed by Mark Brown
parent d0e5faccb2
commit e6204f39fe
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/spi/spi-amd.c
View file

@ -298,19 +298,16 @@ static const struct amd_spi_freq amd_spi_freq[] = {
{ AMD_SPI_MIN_HZ, F_800KHz, 0}, { AMD_SPI_MIN_HZ, F_800KHz, 0},
}; };
static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz) static void amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
{ {
unsigned int i, spd7_val, alt_spd; unsigned int i, spd7_val, alt_spd;
if (speed_hz < AMD_SPI_MIN_HZ)
return -EINVAL;
for (i = 0; i < ARRAY_SIZE(amd_spi_freq); i++) for (i = 0; i < ARRAY_SIZE(amd_spi_freq); i++)
if (speed_hz >= amd_spi_freq[i].speed_hz) if (speed_hz >= amd_spi_freq[i].speed_hz)
break; break;
if (amd_spi->speed_hz == amd_spi_freq[i].speed_hz) if (amd_spi->speed_hz == amd_spi_freq[i].speed_hz)
return 0; return;
amd_spi->speed_hz = amd_spi_freq[i].speed_hz; amd_spi->speed_hz = amd_spi_freq[i].speed_hz;
@ -329,8 +326,6 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
amd_spi_setclear_reg32(amd_spi, AMD_SPI_SPEED_REG, spd7_val, amd_spi_setclear_reg32(amd_spi, AMD_SPI_SPEED_REG, spd7_val,
AMD_SPI_SPD7_MASK); AMD_SPI_SPD7_MASK);
} }
return 0;
} }
static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi,
@ -679,9 +674,7 @@ static int amd_spi_exec_mem_op(struct spi_mem *mem,
amd_spi = spi_controller_get_devdata(mem->spi->controller); amd_spi = spi_controller_get_devdata(mem->spi->controller);
ret = amd_set_spi_freq(amd_spi, op->max_freq); amd_set_spi_freq(amd_spi, op->max_freq);
if (ret)
return ret;
if (amd_spi->version == AMD_SPI_V2) if (amd_spi->version == AMD_SPI_V2)
amd_set_spi_addr_mode(amd_spi, op); amd_set_spi_addr_mode(amd_spi, op);