i2c: st: Use min() to improve code

Use min() to reduce the code and improve its readability.

The type of the max parameter in the st_i2c_rd_fill_tx_fifo()
was changed from int to u32, because the max parameter passed
in is always greater than 0.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250709042347.550993-1-rongqianfeng@vivo.com

diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
index 750fff3d2389e6eb3db2ca1d6114a3654f374649..bf28f8e3ee6bda7ba89130d0fb99449b5dfe8d1c 100644 (file)
--- a/drivers/i2c/busses/i2c-st.c
+++ b/drivers/i2c/busses/i2c-st.c
@@ -13,6 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/minmax.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -422,12 +423,8 @@ static void st_i2c_wr_fill_tx_fifo(struct st_i2c_dev *i2c_dev)
        tx_fstat = readl_relaxed(i2c_dev->base + SSC_TX_FSTAT);
        tx_fstat &= SSC_TX_FSTAT_STATUS;
 
-       if (c->count < (SSC_TXFIFO_SIZE - tx_fstat))
-               i = c->count;
-       else
-               i = SSC_TXFIFO_SIZE - tx_fstat;
-
-       for (; i > 0; i--, c->count--, c->buf++)
+       for (i = min(c->count, SSC_TXFIFO_SIZE - tx_fstat);
+            i > 0; i--, c->count--, c->buf++)
                st_i2c_write_tx_fifo(i2c_dev, *c->buf);
 }
 
@@ -439,7 +436,7 @@ static void st_i2c_wr_fill_tx_fifo(struct st_i2c_dev *i2c_dev)
  * This functions fills the Tx FIFO with fixed pattern when
  * in read mode to trigger clock.
  */
-static void st_i2c_rd_fill_tx_fifo(struct st_i2c_dev *i2c_dev, int max)
+static void st_i2c_rd_fill_tx_fifo(struct st_i2c_dev *i2c_dev, u32 max)
 {
        struct st_i2c_client *c = &i2c_dev->client;
        u32 tx_fstat, sta;
@@ -452,12 +449,8 @@ static void st_i2c_rd_fill_tx_fifo(struct st_i2c_dev *i2c_dev, int max)
        tx_fstat = readl_relaxed(i2c_dev->base + SSC_TX_FSTAT);
        tx_fstat &= SSC_TX_FSTAT_STATUS;
 
-       if (max < (SSC_TXFIFO_SIZE - tx_fstat))
-               i = max;
-       else
-               i = SSC_TXFIFO_SIZE - tx_fstat;
-
-       for (; i > 0; i--, c->xfered++)
+       for (i = min(max, SSC_TXFIFO_SIZE - tx_fstat);
+            i > 0; i--, c->xfered++)
                st_i2c_write_tx_fifo(i2c_dev, 0xff);
 }