spi: consolidate setting message->spi

[ Upstream commit b204aa0f99cfe3c9d796ecfc0bc6f3f89585789e ]

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: David Lechner <dlechner@baylibre.com>
Link: https://msgid.link/r/20240123214946.2616786-1-dlechner@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: c8bec3355f08 ("spi: move split xfers for CS_WORD emulation")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index f2170f4b50775ea175c3d0c1e4a7ef0f809e6a52..8dfe635fffd633b28fff04bf5a478a342eb233c5 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -4063,6 +4063,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
@@ -4075,9 +4077,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)
@@ -4214,8 +4213,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);
 
@@ -4395,8 +4392,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);