@@ -298,19 +298,16 @@ static const struct amd_spi_freq amd_spi_freq[] = {
298
298
{ AMD_SPI_MIN_HZ , F_800KHz , 0 },
299
299
};
300
300
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 )
302
302
{
303
303
unsigned int i , spd7_val , alt_spd ;
304
304
305
- if (speed_hz < AMD_SPI_MIN_HZ )
306
- return - EINVAL ;
307
-
308
305
for (i = 0 ; i < ARRAY_SIZE (amd_spi_freq ); i ++ )
309
306
if (speed_hz >= amd_spi_freq [i ].speed_hz )
310
307
break ;
311
308
312
309
if (amd_spi -> speed_hz == amd_spi_freq [i ].speed_hz )
313
- return 0 ;
310
+ return ;
314
311
315
312
amd_spi -> speed_hz = amd_spi_freq [i ].speed_hz ;
316
313
@@ -329,8 +326,6 @@ static int amd_set_spi_freq(struct amd_spi *amd_spi, u32 speed_hz)
329
326
amd_spi_setclear_reg32 (amd_spi , AMD_SPI_SPEED_REG , spd7_val ,
330
327
AMD_SPI_SPD7_MASK );
331
328
}
332
-
333
- return 0 ;
334
329
}
335
330
336
331
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,
679
674
680
675
amd_spi = spi_controller_get_devdata (mem -> spi -> controller );
681
676
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 );
685
678
686
679
if (amd_spi -> version == AMD_SPI_V2 )
687
680
amd_set_spi_addr_mode (amd_spi , op );
0 commit comments