staging: rtl8723bs: Replace string with identifier
authorJavier F. Arias <jarias.linux@gmail.com>
Thu, 17 Oct 2019 04:01:53 +0000 (23:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Oct 2019 18:33:35 +0000 (20:33 +0200)
Replace the hardcoded function names with the corresponding
predefined identifiers.
Issue found by checkpatch.

Signed-off-by: Javier F. Arias <jarias.linux@gmail.com>
Link: https://lore.kernel.org/r/b2ff6a52a7140480c9fdb6486a6ac6b4eb51203b.1571284318.git.jarias.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_security.c

index ed1d854998581d08050399db3d9c62e6d2603819..8ed6ba1cd5fa5644be4d26ba63eace09746d0f6f 100644 (file)
@@ -303,8 +303,8 @@ void rtw_wep_decrypt(struct adapter  *padapter, u8 *precvframe)
                *((u32 *)crc) = le32_to_cpu(getcrc32(payload, length-4));
 
                if (crc[3] != payload[length-1] || crc[2] != payload[length-2] || crc[1] != payload[length-3] || crc[0] != payload[length-4]) {
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_wep_decrypt:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
-                                               crc[3], payload[length-1], crc[2], payload[length-2], crc[1], payload[length-3], crc[0], payload[length-4]));
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s:icv error crc[3](%x)!=payload[length-1](%x) || crc[2](%x)!=payload[length-2](%x) || crc[1](%x)!=payload[length-3](%x) || crc[0](%x)!=payload[length-4](%x)\n",
+                                               __func__, crc[3], payload[length-1], crc[2], payload[length-2], crc[1], payload[length-3], crc[0], payload[length-4]));
                }
 
                WEP_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);
@@ -694,7 +694,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
                                return _FAIL;
                        }
 */
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo!= NULL!!!\n"));
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
 
                        if (IS_MCAST(pattrib->ra))
                                prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
@@ -847,7 +847,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
 
                        TKIP_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);
                } else {
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_decrypt: stainfo == NULL!!!\n"));
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n", __func__));
                        res = _FAIL;
                }
 
@@ -1536,7 +1536,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
        /* 4 start to encrypt each fragment */
        if (pattrib->encrypt == _AES_) {
-               RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo!= NULL!!!\n"));
+               RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
 
                if (IS_MCAST(pattrib->ra))
                        prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
@@ -1825,10 +1825,10 @@ static sint aes_decipher(u8 *key, uint  hdrlen,
        /* compare the mic */
        for (i = 0; i < 8; i++) {
                if (pframe[hdrlen+8+plen-8+i] != message[hdrlen+8+plen-8+i]) {
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
-                                       i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]));
-                       DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
-                                       i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]);
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",
+                                       __func__, i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]));
+                       DBG_871X("%s:mic check error mic[%d]: pframe(%x) != message(%x)\n",
+                                       __func__, i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]);
                        res = _FAIL;
                }
        }
@@ -1859,7 +1859,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
        if (prxattrib->encrypt == _AES_) {
                stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]);
                if (stainfo != NULL) {
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_decrypt: stainfo!= NULL!!!\n"));
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
 
                        if (IS_MCAST(prxattrib->ra)) {
                                static unsigned long start;
@@ -1917,7 +1917,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
 
                        AES_SW_DEC_CNT_INC(psecuritypriv, prxattrib->ra);
                } else {
-                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_decrypt: stainfo == NULL!!!\n"));
+                       RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo == NULL!!!\n", __func__));
                        res = _FAIL;
                }
        }