From: Gulsah Kose Date: Thu, 30 Oct 2014 01:03:46 +0000 (+0200) Subject: staging: rtl8188eu: os_dep: Used min_t instead of min X-Git-Tag: firefly_0821_release~176^2~2665^2~578 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3fd511d98660cba235dfadf1f296a3246fbaea58;p=firefly-linux-kernel-4.4.55.git staging: rtl8188eu: os_dep: Used min_t instead of min This patch fixes this checkpatch.pl warning: WARNING: min() should probably be min_t(int, req->essid_len, IW_ESSID_MAX_SIZE) by using this coccinelle script: @r@ identifier i; expression e1, e2; type t1, t2; @@ t1 i = - min((t2)e1, e2); + min_t(t2, e1, e2); Signed-off-by: Gulsah Kose Reviewed-by: Daniel Baluta Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c index 70b729f26613..08ba7d3e6c69 100644 --- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c @@ -1134,7 +1134,8 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, struct iw_scan_req *req = (struct iw_scan_req *)extra; if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { - int len = min((int)req->essid_len, IW_ESSID_MAX_SIZE); + int len = min_t(int, req->essid_len, + IW_ESSID_MAX_SIZE); memcpy(ssid[0].Ssid, req->essid, len); ssid[0].SsidLength = len;