rtlwifi: Remove some redundant code

The symbol DBG_EMERG is no longer used and is removed.

In a number of places, the code has redundant messages. For example, if
the failure for the firmware to run is logged, it is not necessary to
log that the firmware has been started. In addition, extraneous braces are
removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.h b/drivers/net/wireless/realtek/rtlwifi/debug.h
index 6f2e2b9..a6cc3ca 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/debug.h
+++ b/drivers/net/wireless/realtek/rtlwifi/debug.h
@@ -36,7 +36,7 @@
  *unexpected HW behavior, HW BUG
  *and so on.
  */
-#define DBG_EMERG                      0
+/*#define DBG_EMERG                    0 */
 
 /*
  *Abnormal, rare, or unexpeted cases.

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
index 8f37863..afa784a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
@@ -222,12 +222,8 @@ int rtl88e_download_fw(struct ieee80211_hw *hw,
        _rtl88e_enable_fw_download(hw, false);
 
        err = _rtl88e_fw_free_to_go(hw);
-       if (err) {
+       if (err)
                pr_err("Firmware is not ready to run!\n");
-       } else {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                        "Firmware is ready to run!\n");
-       }
 
        return 0;
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
index f3fb31b..433ab7f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
@@ -238,12 +238,8 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
        _rtl92c_enable_fw_download(hw, false);
 
        err = _rtl92c_fw_free_to_go(hw);
-       if (err) {
+       if (err)
                pr_err("Firmware is not ready to run!\n");
-       } else {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "Firmware is ready to run!\n");
-       }
 
        return 0;
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
index 87e90a3..aa1e51c 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c
@@ -125,9 +125,8 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw,
                _rtl92d_fill_dummy(bufferPtr, &size);
        pagenums = size / FW_8192D_PAGE_SIZE;
        remainSize = size % FW_8192D_PAGE_SIZE;
-       if (pagenums > 8) {
+       if (pagenums > 8)
                pr_err("Page numbers should not greater then 8\n");
-       }
        for (page = 0; page < pagenums; page++) {
                offset = page * FW_8192D_PAGE_SIZE;
                _rtl92d_fw_page_write(hw, page, (bufferPtr + offset),
@@ -156,8 +155,6 @@ static int _rtl92d_fw_free_to_go(struct ieee80211_hw *hw)
                       value32);
                return -EIO;
        }
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                "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);
@@ -324,12 +321,9 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
        value &= (~BIT(5));
        rtl_write_byte(rtlpriv, 0x1f, value);
        spin_unlock_irqrestore(&globalmutex_for_fwdownload, flags);
-       if (err) {
+       if (err)
                pr_err("fw is not ready to run!\n");
                goto exit;
-       } else {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "fw is ready to run!\n");
-       }
 exit:
        err = _rtl92d_fw_init(hw);
        return err;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
index 8fe64da..78ee6e1 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
@@ -157,10 +157,6 @@ static int _rtl92ee_fw_free_to_go(struct ieee80211_hw *hw)
                       value32);
                goto exit;
        }
-
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                "Checksum report OK! REG_MCUFWDL:0x%08x\n", value32);
-
        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
        value32 |= MCUFWDL_RDY;
        value32 &= ~WINTINI_RDY;
@@ -171,13 +167,8 @@ static int _rtl92ee_fw_free_to_go(struct ieee80211_hw *hw)
 
        do {
                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
-               if (value32 & WINTINI_RDY) {
-                       RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD ,
-                                "Polling FW ready success!! REG_MCUFWDL:0x%08x. count = %d\n",
-                                value32, counter);
-                       err = 0;
-                       goto exit;
-               }
+               if (value32 & WINTINI_RDY)
+                       return 0;
 
                udelay(FW_8192C_POLLING_DELAY*10);
 
@@ -236,12 +227,6 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
        _rtl92ee_enable_fw_download(hw, false);
 
        err = _rtl92ee_fw_free_to_go(hw);
-       if (err) {
-               pr_err("Firmware is not ready to run!\n");
-       } else {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD ,
-                        "Firmware is ready to run!\n");
-       }
 
        return 0;
 }

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
index ad72024..8e0d038 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
@@ -213,9 +213,6 @@ int rtl8723_fw_free_to_go(struct ieee80211_hw *hw, bool is_8723be,
                       value32);
                goto exit;
        }
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                "Checksum report OK ! REG_MCUFWDL:0x%08x .\n", value32);
-
        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL) | MCUFWDL_RDY;
        value32 &= ~WINTINI_RDY;
        rtl_write_dword(rtlpriv, REG_MCUFWDL, value32);
@@ -291,12 +288,8 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
        rtl8723_enable_fw_download(hw, false);
 
        err = rtl8723_fw_free_to_go(hw, is_8723be, max_count);
-       if (err) {
+       if (err)
                pr_err("Firmware is not ready to run!\n");
-       } else {
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "Firmware is ready to run!\n");
-       }
        return 0;
 }
 EXPORT_SYMBOL_GPL(rtl8723_download_fw);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
index 814136c..94e97dc 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
@@ -124,9 +124,8 @@ static void _rtl8821ae_write_fw(struct ieee80211_hw *hw,
        pagenums = size / FW_8821AE_PAGE_SIZE;
        remainsize = size % FW_8821AE_PAGE_SIZE;
 
-       if (pagenums > 8) {
+       if (pagenums > 8)
                pr_err("Page numbers should not greater then 8\n");
-       }
 
        for (page = 0; page < pagenums; page++) {
                offset = page * FW_8821AE_PAGE_SIZE;
@@ -160,10 +159,6 @@ static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw)
                          value32);
                goto exit;
        }
-
-       pr_err("Checksum report OK! REG_MCUFWDL:0x%08x\n",
-              value32);
-
        value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
        value32 |= MCUFWDL_RDY;
        value32 &= ~WINTINI_RDY;
@@ -174,13 +169,8 @@ static int _rtl8821ae_fw_free_to_go(struct ieee80211_hw *hw)
        counter = 0;
        do {
                value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
-               if (value32 & WINTINI_RDY) {
-                       RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                                "Polling FW ready success!! REG_MCUFWDL:0x%08x .\n",
-                                 value32);
-                       err = 0;
-                       goto exit;
-               }
+               if (value32 & WINTINI_RDY)
+                       return 0;
 
                udelay(FW_8821AE_POLLING_DELAY);
        } while (counter++ < FW_8821AE_POLLING_TIMEOUT_COUNT);