Skip to content

Commit e6204f3

Browse files
miquelraynalbroonie
authored andcommitted
spi: amd: Drop redundant check
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 <[email protected]> Link: https://patch.msgid.link/20241224-winbond-6-11-rc1-quad-support-v2-4-ad218dbc406f@bootlin.com Signed-off-by: Mark Brown <[email protected]>
1 parent d0e5fac commit e6204f3

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

drivers/spi/spi-amd.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,16 @@ static const struct amd_spi_freq amd_spi_freq[] = {
298298
{ AMD_SPI_MIN_HZ, F_800KHz, 0},
299299
};
300300

301-
static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
301+
static void amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
302302
{
303303
unsigned int i, spd7_val, alt_spd;
304304

305-
if (speed_hz < AMD_SPI_MIN_HZ)
306-
return -EINVAL;
307-
308305
for (i = 0; i < ARRAY_SIZE(amd_spi_freq); i++)
309306
if (speed_hz >= amd_spi_freq[i].speed_hz)
310307
break;
311308

312309
if (amd_spi->speed_hz == amd_spi_freq[i].speed_hz)
313-
return 0;
310+
return;
314311

315312
amd_spi->speed_hz = amd_spi_freq[i].speed_hz;
316313

@@ -329,8 +326,6 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
329326
amd_spi_setclear_reg32(amd_spi, AMD_SPI_SPEED_REG, spd7_val,
330327
AMD_SPI_SPD7_MASK);
331328
}
332-
333-
return 0;
334329
}
335330

336331
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,
679674

680675
amd_spi = spi_controller_get_devdata(mem->spi->controller);
681676

682-
ret = amd_set_spi_freq(amd_spi, op->max_freq);
683-
if (ret)
684-
return ret;
677+
amd_set_spi_freq(amd_spi, op->max_freq);
685678

686679
if (amd_spi->version == AMD_SPI_V2)
687680
amd_set_spi_addr_mode(amd_spi, op);

0 commit comments

Comments
 (0)