[PATCH v2 05/20] staging: rtl8188eu: ternary operator (?:) replaced by min_t kernel macro

[Ivan Safonov]

min_t macro better conveys the meaning of the code.

Signed-off-by: Ivan Safonov <insafo...@gmail.com>
---
Changes in v2:
  - min replaced by mit_t.

 drivers/staging/rtl8188eu/core/rtw_efuse.c     | 2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c  | 2 +-
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c 
b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 685ce98..eb89423 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -268,7 +268,7 @@ static void efuse_read_phymap_from_txpktbuf(
                        aaa = le16_to_cpup((__le16 *)&lo32);
                        len = le16_to_cpu(*((__le16 *)&lo32));
 
-                       limit = (len-2 < limit) ? len-2 : limit;
+                       limit = min_t(u16, len-2, limit);
 
                        DBG_88E("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", 
__func__, len, lenbak, aaa, aaabak);
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c 
b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index cc5806f..4e6f1a8 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -3239,7 +3239,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                        pstat->flags |= WLAN_STA_WPS;
                        copy_len = 0;
                } else {
-                       copy_len = ((wpa_ie_len+2) > sizeof(pstat->wpa_ie)) ? 
(sizeof(pstat->wpa_ie)) : (wpa_ie_len+2);
+                       copy_len = min_t(int, wpa_ie_len + 2, 
sizeof(pstat->wpa_ie));
                }
                if (copy_len > 0)
                        memcpy(pstat->wpa_ie, wpa_ie-2, copy_len);
diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c 
b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 9c11ef4..a076ede 100644
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -2669,7 +2669,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, 
struct ieee_param *param)
                        int copy_len;
 
                        wpa_ie_len = psta->wpa_ie[1];
-                       copy_len = ((wpa_ie_len+2) > sizeof(psta->wpa_ie)) ? 
(sizeof(psta->wpa_ie)) : (wpa_ie_len+2);
+                       copy_len = min_t(int, wpa_ie_len + 2, 
sizeof(psta->wpa_ie));
                        param->u.wpa_ie.len = copy_len;
                        memcpy(param->u.wpa_ie.reserved, psta->wpa_ie, 
copy_len);
                } else {
-- 
2.4.10

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel