rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu

Modify some rtl8192ce routines for merging with rtl8192cu. In addition,
remove some usage of Hungarian notation.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
index b0776a34b817..11c8bdb4af59 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/fw.c
@@ -316,12 +316,12 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
 
         while (true) {
                 spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
-                if (rtlhal->b_h2c_setinprogress) {
+                if (rtlhal->h2c_setinprogress) {
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
                                  ("H2C set in progress! Wait to set.."
                                   "element_id(%d).\n", element_id));
 
-                        while (rtlhal->b_h2c_setinprogress) {
+                        while (rtlhal->h2c_setinprogress) {
                                 spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock,
                                                        flag);
                                 h2c_waitcounter++;
@@ -337,7 +337,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         }
                         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
                 } else {
-                        rtlhal->b_h2c_setinprogress = true;
+                        rtlhal->h2c_setinprogress = true;
                         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
                         break;
                 }
@@ -493,7 +493,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
         }
 
         spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
-        rtlhal->b_h2c_setinprogress = false;
+        rtlhal->h2c_setinprogress = false;
         spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("go out\n"));
@@ -505,7 +505,7 @@ void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw,
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->bfw_ready == false) {
+        if (rtlhal->fw_ready == false) {
                 RT_ASSERT(false, ("return H2C cmd because of Fw "
                                   "download fail!!!\n"));
                 return;