staging: rtl8192e: Replace ?: with min_t

Replace :? with min_t for readability. Remove check that is always false.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index d5e13a57ab7a68741866c0f6ec4844bd3b72bed9..86f52ac7d33eda21f41b90ad4c410e719868aae3 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -454,13 +454,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
 
        proto_started = ieee->proto_started;
 
-       len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length :
-              IW_ESSID_MAX_SIZE;
-
-       if (len > IW_ESSID_MAX_SIZE) {
-               ret = -E2BIG;
-               goto out;
-       }
+       len = min_t(__u16, wrqu->essid.length, IW_ESSID_MAX_SIZE);
 
        if (ieee->iw_mode == IW_MODE_MONITOR) {
                ret = -1;

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 2812a777d0f15e66feac65712b2df2cbcd73e0f3..2ac161786796d9c32bbd5fdffc1a41f061757a37 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -851,8 +851,7 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
                if ((eid == MFIE_TYPE_GENERIC) && (!memcmp(&ie[2],
                     wps_oui, 4))) {
 
-                       ieee->wps_ie_len = (len < MAX_WZC_IE_LEN) ? (len) :
-                                          (MAX_WZC_IE_LEN);
+                       ieee->wps_ie_len = min_t(size_t, len, MAX_WZC_IE_LEN);
                        buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL);
                        if (buf == NULL)
                                return -ENOMEM;