spi: Introduce spi_for_each_valid_cs() in order of deduplication

In order of deduplication and better maintenance introduce a new
spi_for_each_valid_cs() helper macro.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240415193340.1279360-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 63abe4320ab416a4a5ea82f8007792a77757f3a8..b5b24d91bd50c7d3817ffeca49746ba8be823240 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1022,16 +1022,18 @@ static void spi_res_release(struct spi_controller *ctlr, struct spi_message *mes
 }
 
 /*-------------------------------------------------------------------------*/
+#define spi_for_each_valid_cs(spi, idx)                                \
+       for (idx = 0; idx < SPI_CS_CNT_MAX; idx++)              \
+               if (!(spi->cs_index_mask & BIT(idx))) {} else
+
 static inline bool spi_is_last_cs(struct spi_device *spi)
 {
        u8 idx;
        bool last = false;
 
-       for (idx = 0; idx < SPI_CS_CNT_MAX; idx++) {
-               if (spi->cs_index_mask & BIT(idx)) {
-                       if (spi->controller->last_cs[idx] == spi_get_chipselect(spi, idx))
-                               last = true;
-               }
+       spi_for_each_valid_cs(spi, idx) {
+               if (spi->controller->last_cs[idx] == spi_get_chipselect(spi, idx))
+                       last = true;
        }
        return last;
 }
@@ -1095,8 +1097,8 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
 
        if (spi_is_csgpiod(spi)) {
                if (!(spi->mode & SPI_NO_CS)) {
-                       for (idx = 0; idx < SPI_CS_CNT_MAX; idx++) {
-                               if ((spi->cs_index_mask & BIT(idx)) && spi_get_csgpiod(spi, idx))
+                       spi_for_each_valid_cs(spi, idx) {
+                               if (spi_get_csgpiod(spi, idx))
                                        spi_toggle_csgpiod(spi, idx, enable, activate);
                        }
                }