Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: fsl-espi: remove usage of 'delay_usecs' field

The 'delay_usecs' field is being removed from the spi_transfer struct.
This change removes it from the SPI FSL ESPI driver.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210308145502.1075689-9-aardelean@deviqon.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Alexandru Ardelean and committed by
Mark Brown
55a47532 a886010c

+5 -12
+5 -12
drivers/spi/spi-fsl-espi.c
··· 435 435 static int fsl_espi_do_one_msg(struct spi_master *master, 436 436 struct spi_message *m) 437 437 { 438 - unsigned int delay_usecs = 0, rx_nbits = 0; 439 - unsigned int delay_nsecs = 0, delay_nsecs1 = 0; 438 + unsigned int rx_nbits = 0, delay_nsecs = 0; 440 439 struct spi_transfer *t, trans = {}; 441 440 int ret; 442 441 ··· 444 445 goto out; 445 446 446 447 list_for_each_entry(t, &m->transfers, transfer_list) { 447 - if (t->delay_usecs) { 448 - if (t->delay_usecs > delay_usecs) { 449 - delay_usecs = t->delay_usecs; 450 - delay_nsecs = delay_usecs * 1000; 451 - } 452 - } else { 453 - delay_nsecs1 = spi_delay_to_ns(&t->delay, t); 454 - if (delay_nsecs1 > delay_nsecs) 455 - delay_nsecs = delay_nsecs1; 456 - } 448 + unsigned int delay = spi_delay_to_ns(&t->delay, t); 449 + 450 + if (delay > delay_nsecs) 451 + delay_nsecs = delay; 457 452 if (t->rx_nbits > rx_nbits) 458 453 rx_nbits = t->rx_nbits; 459 454 }