1 files changed, 48 insertions, 55 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index db6972ffe503..b84f10d60c0d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -124,14 +124,14 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw,
         u32 pagenums, remainSize;
         u32 page, offset;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, ("FW size is %d bytes,\n", size));
+        RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192DE)
                 _rtl92d_fill_dummy(bufferPtr, &size);
         pagenums = size / FW_8192D_PAGE_SIZE;
         remainSize = size % FW_8192D_PAGE_SIZE;
         if (pagenums > 8) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Page numbers should not greater then 8\n"));
+                         "Page numbers should not greater then 8\n");
         }
         for (page = 0; page < pagenums; page++) {
                 offset = page * FW_8192D_PAGE_SIZE;
@@ -158,12 +158,12 @@ static int _rtl92d_fw_free_to_go(struct ieee80211_hw *hw)
                  (!(value32 & FWDL_ChkSum_rpt)));
         if (counter >= FW_8192D_POLLING_TIMEOUT_COUNT) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("chksum report faill ! REG_MCUFWDL:0x%08x .\n",
-                         value32));
+                         "chksum report faill ! REG_MCUFWDL:0x%08x\n",
+                         value32);
                 return -EIO;
         }
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                 ("Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32));
+                 "Checksum report OK ! REG_MCUFWDL:0x%08x\n", value32);
         value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
         value32 |= MCUFWDL_RDY;
         rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
@@ -188,7 +188,7 @@ void rtl92d_firmware_selfreset(struct ieee80211_hw *hw)
         }
         RT_ASSERT((delay > 0), ("8051 reset failed!\n"));
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 ("=====> 8051 reset success (%d) .\n", delay));
+                 "=====> 8051 reset success (%d)\n", delay);
 }
 
 static int _rtl92d_fw_init(struct ieee80211_hw *hw)
@@ -197,7 +197,7 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 counter;
 
-        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, ("FW already have download\n"));
+        RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, "FW already have download\n");
         /* polling for FW ready */
         counter = 0;
         do {
@@ -205,10 +205,9 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
                         if (rtl_read_byte(rtlpriv, FW_MAC0_READY) &
                             MAC0_READY) {
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Polling FW ready success!! "
-                                         "REG_MCUFWDL: 0x%x .\n",
+                                         "Polling FW ready success!! REG_MCUFWDL: 0x%x\n",
                                          rtl_read_byte(rtlpriv,
-                                         FW_MAC0_READY)));
+                                                       FW_MAC0_READY));
                                 return 0;
                         }
                         udelay(5);
@@ -216,10 +215,9 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
                         if (rtl_read_byte(rtlpriv, FW_MAC1_READY) &
                             MAC1_READY) {
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Polling FW ready success!! "
-                                         "REG_MCUFWDL: 0x%x .\n",
+                                         "Polling FW ready success!! REG_MCUFWDL: 0x%x\n",
                                          rtl_read_byte(rtlpriv,
-                                                       FW_MAC1_READY)));
+                                                       FW_MAC1_READY));
                                 return 0;
                         }
                         udelay(5);
@@ -228,18 +226,16 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw)
 
         if (rtlhal->interfaceindex == 0) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Polling FW ready fail!! MAC0 FW init not ready: "
-                         "0x%x .\n",
-                         rtl_read_byte(rtlpriv, FW_MAC0_READY)));
+                         "Polling FW ready fail!! MAC0 FW init not ready: 0x%x\n",
+                         rtl_read_byte(rtlpriv, FW_MAC0_READY));
         } else {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Polling FW ready fail!! MAC1 FW init not ready: "
-                         "0x%x .\n",
-                         rtl_read_byte(rtlpriv, FW_MAC1_READY)));
+                         "Polling FW ready fail!! MAC1 FW init not ready: 0x%x\n",
+                         rtl_read_byte(rtlpriv, FW_MAC1_READY));
         }
         RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                 ("Polling FW ready fail!! REG_MCUFWDL:0x%08ul .\n",
-                 rtl_read_dword(rtlpriv, REG_MCUFWDL)));
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08ul\n",
+                 rtl_read_dword(rtlpriv, REG_MCUFWDL));
         return -1;
 }
 
@@ -264,13 +260,13 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         pfwdata = (u8 *) rtlhal->pfirmware;
         rtlhal->fw_version = (u16) GET_FIRMWARE_HDR_VERSION(pfwheader);
         rtlhal->fw_subversion = (u16) GET_FIRMWARE_HDR_SUB_VER(pfwheader);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, (" FirmwareVersion(%d),"
-                 "FirmwareSubVersion(%d), Signature(%#x)\n",
-                 rtlhal->fw_version,    rtlhal->fw_subversion,
-                 GET_FIRMWARE_HDR_SIGNATURE(pfwheader)));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "FirmwareVersion(%d), FirmwareSubVersion(%d), Signature(%#x)\n",
+                 rtlhal->fw_version, rtlhal->fw_subversion,
+                 GET_FIRMWARE_HDR_SIGNATURE(pfwheader));
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Shift 32 bytes for FW header!!\n"));
+                         "Shift 32 bytes for FW header!!\n");
                 pfwdata = pfwdata + 32;
                 fwsize = fwsize - 32;
         }
@@ -302,8 +298,7 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
                                 break;
                         else
                                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                                         ("Wait for another mac "
-                                         "download fw\n"));
+                                         "Wait for another mac download fw\n");
                 }
                 spin_lock_irqsave(&globalmutex_for_fwdownload, flags);
                 value = rtl_read_byte(rtlpriv, 0x1f);
@@ -337,11 +332,10 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         spin_unlock_irqrestore(&globalmutex_for_fwdownload, flags);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("fw is not ready to run!\n"));
+                         "fw is not ready to run!\n");
                 goto exit;
         } else {
-                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         ("fw is ready to run!\n"));
+                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "fw is ready to run!\n");
         }
 exit:
         err = _rtl92d_fw_init(hw);
@@ -381,24 +375,24 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
 
         if (ppsc->rfpwr_state == ERFOFF || ppsc->inactive_pwrstate == ERFOFF) {
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("Return as RF is off!!!\n"));
+                         "Return as RF is off!!!\n");
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("come in\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "come in\n");
         while (true) {
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
                 if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("H2C set in progress! Wait to set.."
-                                 "element_id(%d).\n", element_id));
+                                 "H2C set in progress! Wait to set..element_id(%d)\n",
+                                 element_id);
 
                         while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
                                                        flag);
                                 h2c_waitcounter++;
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wait 100 us (%d times)...\n",
-                                         h2c_waitcounter));
+                                         "Wait 100 us (%d times)...\n",
+                                         h2c_waitcounter);
                                 udelay(100);
 
                                 if (h2c_waitcounter > 1000)
@@ -418,8 +412,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                 wait_writeh2c_limmit--;
                 if (wait_writeh2c_limmit == 0) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Write H2C fail because no trigger "
-                                 "for FW INT!\n"));
+                                 "Write H2C fail because no trigger for FW INT!\n");
                         break;
                 }
                 boxnum = rtlhal->last_hmeboxnum;
@@ -442,7 +435,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
@@ -450,29 +443,29 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         wait_h2c_limmit--;
                         if (wait_h2c_limmit == 0) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                         ("Wating too long for FW read "
-                                         "clear HMEBox(%d)!\n", boxnum));
+                                         "Waiting too long for FW read clear HMEBox(%d)!\n",
+                                         boxnum);
                                 break;
                         }
                         udelay(10);
                         isfw_read = _rtl92d_check_fw_read_last_h2c(hw, boxnum);
                         u1b_tmp = rtl_read_byte(rtlpriv, 0x1BF);
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Wating for FW read clear HMEBox(%d)!!! "
-                                 "0x1BF = %2x\n", boxnum, u1b_tmp));
+                                 "Waiting for FW read clear HMEBox(%d)!!! 0x1BF = %2x\n",
+                                 boxnum, u1b_tmp);
                 }
                 if (!isfw_read) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Write H2C register BOX[%d] fail!!!!! "
-                                 "Fw do not read.\n", boxnum));
+                                 "Write H2C register BOX[%d] fail!!!!! Fw do not read.\n",
+                                 boxnum);
                         break;
                 }
                 memset(boxcontent, 0, sizeof(boxcontent));
                 memset(boxextcontent, 0, sizeof(boxextcontent));
                 boxcontent[0] = element_id;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("Write element_id box_reg(%4x) = %2x\n",
-                         box_reg, element_id));
+                         "Write element_id box_reg(%4x) = %2x\n",
+                         box_reg, element_id);
                 switch (cmd_len) {
                 case 1:
                         boxcontent[0] &= ~(BIT(7));
@@ -519,7 +512,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 bwrite_sucess = true;
@@ -527,13 +520,13 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
                 if (rtlhal->last_hmeboxnum == 4)
                         rtlhal->last_hmeboxnum = 0;
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("pHalData->last_hmeboxnum  = %d\n",
-                          rtlhal->last_hmeboxnum));
+                         "pHalData->last_hmeboxnum  = %d\n",
+                         rtlhal->last_hmeboxnum);
         }
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
         rtlhal->h2c_setinprogress = false;
         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("go out\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "go out\n");
 }
 
 void rtl92d_fill_h2c_cmd(struct ieee80211_hw *hw,
@@ -559,7 +552,7 @@ void rtl92d_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
         u8 u1_h2c_set_pwrmode[3] = { 0 };
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
 
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("FW LPS mode = %d\n", mode));
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "FW LPS mode = %d\n", mode);
         SET_H2CCMD_PWRMODE_PARM_MODE(u1_h2c_set_pwrmode, mode);
         SET_H2CCMD_PWRMODE_PARM_SMART_PS(u1_h2c_set_pwrmode, 1);
         SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(u1_h2c_set_pwrmode,
@@ -771,14 +764,14 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
                 dlok = true;
         if (dlok) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Set RSVD page location to Fw.\n"));
+                         "Set RSVD page location to Fw\n");
                 RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
                               "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
                 rtl92d_fill_h2c_cmd(hw, H2C_RSVDPAGE,
                         sizeof(u1RsvdPageLoc), u1RsvdPageLoc);
         } else
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                        ("Set RSVD page location to Fw FAIL!!!!!!.\n"));
+                         "Set RSVD page location to Fw FAIL!!!!!!\n");
 }
 
 void rtl92d_set_fw_joinbss_report_cmd(struct ieee80211_hw *hw, u8 mstatus)