ASoC: codecs: Use min() to simplify aw_dev_dsp_update_container()

Use min() to simplify aw_dev_dsp_update_container() and improve its
readability.

No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20250429071032.65391-2-thorsten.blum@linux.dev
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/aw88166.c b/sound/soc/codecs/aw88166.c
index 6c50c4a18b6aa89a3c3df77d3f91e659495fb353..4f76ebe11cc7ec8c679a56839272ca5a065164b6 100644 (file)
--- a/sound/soc/codecs/aw88166.c
+++ b/sound/soc/codecs/aw88166.c
@@ -11,6 +11,7 @@
 #include <linux/firmware.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
+#include <linux/minmax.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
 #include "aw88166.h"
@@ -909,11 +910,7 @@ static int aw_dev_dsp_update_container(struct aw_device *aw_dev,
                goto error_operation;
 
        for (i = 0; i < len; i += AW88166_MAX_RAM_WRITE_BYTE_SIZE) {
-               if ((len - i) < AW88166_MAX_RAM_WRITE_BYTE_SIZE)
-                       tmp_len = len - i;
-               else
-                       tmp_len = AW88166_MAX_RAM_WRITE_BYTE_SIZE;
-
+               tmp_len = min(len - i, AW88166_MAX_RAM_WRITE_BYTE_SIZE);
                ret = regmap_raw_write(aw_dev->regmap, AW88166_DSPMDAT_REG,
                                        &data[i], tmp_len);
                if (ret)

diff --git a/sound/soc/codecs/aw88395/aw88395_device.c b/sound/soc/codecs/aw88395/aw88395_device.c
index b7ea8be0d0cb0c412ec1cfae87a774ad47f933d3..e1430940015d6da0d707711bf7de570c9c92a25c 100644 (file)
--- a/sound/soc/codecs/aw88395/aw88395_device.c
+++ b/sound/soc/codecs/aw88395/aw88395_device.c
@@ -10,6 +10,7 @@
 
 #include <linux/crc32.h>
 #include <linux/i2c.h>
+#include <linux/minmax.h>
 #include <linux/regmap.h>
 #include "aw88395_device.h"
 #include "aw88395_reg.h"
@@ -1114,11 +1115,7 @@ static int aw_dev_dsp_update_container(struct aw_device *aw_dev,
                goto error_operation;
 
        for (i = 0; i < len; i += AW88395_MAX_RAM_WRITE_BYTE_SIZE) {
-               if ((len - i) < AW88395_MAX_RAM_WRITE_BYTE_SIZE)
-                       tmp_len = len - i;
-               else
-                       tmp_len = AW88395_MAX_RAM_WRITE_BYTE_SIZE;
-
+               tmp_len = min(len - i, AW88395_MAX_RAM_WRITE_BYTE_SIZE);
                ret = regmap_raw_write(aw_dev->regmap, AW88395_DSPMDAT_REG,
                                        &data[i], tmp_len);
                if (ret)

diff --git a/sound/soc/codecs/aw88399.c b/sound/soc/codecs/aw88399.c
index ee3cc2a95f85e75be0e8bdaa9db48aea3d0218a2..4b90133e5ab4954b836db3249da8074708f652bf 100644 (file)
--- a/sound/soc/codecs/aw88399.c
+++ b/sound/soc/codecs/aw88399.c
@@ -11,6 +11,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/firmware.h>
+#include <linux/minmax.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
 #include "aw88399.h"
@@ -872,11 +873,7 @@ static int aw_dev_dsp_update_container(struct aw_device *aw_dev,
                goto error_operation;
 
        for (i = 0; i < len; i += AW88399_MAX_RAM_WRITE_BYTE_SIZE) {
-               if ((len - i) < AW88399_MAX_RAM_WRITE_BYTE_SIZE)
-                       tmp_len = len - i;
-               else
-                       tmp_len = AW88399_MAX_RAM_WRITE_BYTE_SIZE;
-
+               tmp_len = min(len - i, AW88399_MAX_RAM_WRITE_BYTE_SIZE);
                ret = regmap_raw_write(aw_dev->regmap, AW88399_DSPMDAT_REG,
                                        &data[i], tmp_len);
                if (ret)