wifi: brcm80211: Use min() to improve code

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

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>>
Link: https://patch.msgid.link/20250715121721.266713-5-rongqianfeng@vivo.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index b056336d5da6098867b9439f4b277b6e6397ea9c..f0129d10d2b952adfd53114809738d634f86fd31 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -927,10 +927,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
                /* Wait until the usb device reports it received all
                 * the bytes we sent */
                if ((rdlbytes == sent) && (rdlbytes != dllen)) {
-                       if ((dllen-sent) < TRX_RDL_CHUNK)
-                               sendlen = dllen-sent;
-                       else
-                               sendlen = TRX_RDL_CHUNK;
+                       sendlen = min(dllen - sent, TRX_RDL_CHUNK);
 
                        /* simply avoid having to send a ZLP by ensuring we
                         * never have an even

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index d362c4337616b44afbca5d109029183ca1bc643b..b679821c7f998c4439fb7b956a6b7c79e9c731b5 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
@@ -25825,10 +25825,8 @@ wlc_phy_cal_txiqlo_nphy(struct brcms_phy *pi, struct nphy_txgains target_gain,
 
                if (mphase) {
                        cal_cnt = pi->mphase_txcal_cmdidx;
-                       if ((cal_cnt + pi->mphase_txcal_numcmds) < max_cal_cmds)
-                               num_cals = cal_cnt + pi->mphase_txcal_numcmds;
-                       else
-                               num_cals = max_cal_cmds;
+                       num_cals = min(cal_cnt + pi->mphase_txcal_numcmds,
+                                      max_cal_cmds);
                } else {
                        cal_cnt = 0;
                        num_cals = max_cal_cmds;