Unverified Commit b204aa0f authored by David Lechner's avatar David Lechner Committed by Mark Brown
Browse files

spi: consolidate setting message->spi 



Previously, __spi_sync() and __spi_async() set message->spi to the spi
device independently after calling __spi_validate(). __spi_validate()
also would conditionally set this if it needed to split the message
since it wasn't set yet.

Since both __spi_sync() and __spi_async() call __spi_validate(), we can
consolidate this into only setting message->spi once (unconditionally)
in __spi_validate(). This will also save any future callers of
__spi_validate() from also needing to set message->spi.

Signed-off-by: default avatarDavid Lechner <dlechner@baylibre.com>
Link: https://msgid.link/r/20240123214946.2616786-1-dlechner@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 18ab9e9e

drivers/spi/spi.c

+2 −7
Original line number Diff line number Diff line
@@ -4059,6 +4059,8 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) 
	if (list_empty(&message->transfers))

		return -EINVAL;



	message->spi = spi;



	/*

	 * If an SPI controller does not support toggling the CS line on each

	 * transfer (indicated by the SPI_CS_WORD flag) or we are using a GPIO
@@ -4071,9 +4073,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) 
		size_t maxsize = BITS_TO_BYTES(spi->bits_per_word);

		int ret;



		/* spi_split_transfers_maxsize() requires message->spi */

		message->spi = spi;



		ret = spi_split_transfers_maxsize(ctlr, message, maxsize,

						  GFP_KERNEL);

		if (ret)
@@ -4210,8 +4209,6 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) 
	if (!ctlr->transfer)

		return -ENOTSUPP;



	message->spi = spi;



	SPI_STATISTICS_INCREMENT_FIELD(ctlr->pcpu_statistics, spi_async);

	SPI_STATISTICS_INCREMENT_FIELD(spi->pcpu_statistics, spi_async);
@@ -4391,8 +4388,6 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message) 
	if (status != 0)

		return status;



	message->spi = spi;



	SPI_STATISTICS_INCREMENT_FIELD(ctlr->pcpu_statistics, spi_sync);

	SPI_STATISTICS_INCREMENT_FIELD(spi->pcpu_statistics, spi_sync);