media: dvb-frontends: drx39xyj: Use min macro

Replace ternary assignments with min() to simplify and make the code
more readable.

Found by cocci:
drivers/media/dvb-frontends/drx39xyj/drxj.c:1447:23-24: WARNING opportunity for min()
drivers/media/dvb-frontends/drx39xyj/drxj.c:1662:21-22: WARNING opportunity for min()
drivers/media/dvb-frontends/drx39xyj/drxj.c:1685:24-25: WARNING opportunity for min()

Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-14-3c4865f5a4b0@chromium.org
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index 1ef53754bc03760ada53dea5e24efab9721ea396..6fcaf07e1b82725923511e033243d53188906533 100644 (file)
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -1445,8 +1445,7 @@ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr,
 
        /* Read block from I2C **************************************************** */
        do {
-               u16 todo = (datasize < DRXDAP_MAX_RCHUNKSIZE ?
-                             datasize : DRXDAP_MAX_RCHUNKSIZE);
+               u16 todo = min(datasize, DRXDAP_MAX_RCHUNKSIZE);
 
                bufx = 0;
 
@@ -1660,7 +1659,7 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
                   Address must be rewritten because HI is reset after data transport and
                   expects an address.
                 */
-               todo = (block_size < datasize ? block_size : datasize);
+               todo = min(block_size, datasize);
                if (todo == 0) {
                        u16 overhead_size_i2c_addr = 0;
                        u16 data_block_size = 0;
@@ -1682,9 +1681,7 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
                                first_err = st;
                        }
                        bufx = 0;
-                       todo =
-                           (data_block_size <
-                            datasize ? data_block_size : datasize);
+                       todo = min(data_block_size, datasize);
                }
                memcpy(&buf[bufx], data, todo);
                /* write (address if can do and) data */