1 files changed, 39 insertions, 46 deletions

diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index dc36d7461caa..5c7d57947d23 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -27,8 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/export.h>
 #include "wifi.h"
 #include "cam.h"
@@ -55,10 +53,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
         u8 entry_i;
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("key_cont_128:\n %x:%x:%x:%x:%x:%x\n",
-                  key_cont_128[0], key_cont_128[1],
-                  key_cont_128[2], key_cont_128[3],
-                  key_cont_128[4], key_cont_128[5]));
+                 "key_cont_128:\n %x:%x:%x:%x:%x:%x\n",
+                 key_cont_128[0], key_cont_128[1],
+                 key_cont_128[2], key_cont_128[3],
+                 key_cont_128[4], key_cont_128[5]);
 
         for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
                 target_command = entry_i + CAM_CONTENT_COUNT * entry_no;
@@ -73,14 +71,12 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                                 rtlpriv->cfg->maps[WCAMI], target_content);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE %x: %x\n",
-                                  rtlpriv->cfg->maps[WCAMI], target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The Key ID is %d\n", entry_no));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE %x: %x\n",
-                                  rtlpriv->cfg->maps[RWCAM], target_command));
+                                 "The Key ID is %d\n", entry_no);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE %x: %x\n",
+                                 rtlpriv->cfg->maps[RWCAM], target_command);
 
                 } else if (entry_i == 1) {
 
@@ -94,10 +90,10 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                         target_command);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A4: %x\n", target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A0: %x\n", target_command));
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
+                                 target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
+                                 target_command);
 
                 } else {
 
@@ -114,15 +110,15 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no,
                                         target_command);
                         udelay(100);
 
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A4: %x\n", target_content));
-                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("WRITE A0: %x\n", target_command));
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n",
+                                 target_content);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A0: %x\n",
+                                 target_command);
                 }
         }
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("after set key, usconfig:%x\n", us_config));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "after set key, usconfig:%x\n",
+                 us_config);
 }
 
 u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
@@ -133,14 +129,13 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, "
-                  "ulUseDK=%x MacAddr %pM\n",
-                  ul_entry_idx, ul_key_id, ul_enc_alg,
-                  ul_default_key, mac_addr));
+                 "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
+                 ul_entry_idx, ul_key_id, ul_enc_alg,
+                 ul_default_key, mac_addr);
 
         if (ul_key_id == TOTAL_CAM_ENTRY) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("<=== ulKeyId exceed!\n"));
+                         "<=== ulKeyId exceed!\n");
                 return 0;
         }
 
@@ -153,7 +148,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,
                               (u8 *) key_content, us_config);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");
 
         return 1;
 
@@ -166,7 +161,7 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,
         u32 ul_command;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("key_idx:%d\n", ul_key_id));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "key_idx:%d\n", ul_key_id);
 
         ul_command = ul_key_id * CAM_CONTENT_COUNT;
         ul_command = ul_command | BIT(31) | BIT(16);
@@ -175,9 +170,9 @@ int rtl_cam_delete_one_entry(struct ieee80211_hw *hw,
         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0));
+                 "rtl_cam_delete_one_entry(): WRITE A4: %x\n", 0);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command));
+                 "rtl_cam_delete_one_entry(): WRITE A0: %x\n", ul_command);
 
         return 0;
 
@@ -229,9 +224,9 @@ void rtl_cam_mark_invalid(struct ieee80211_hw *hw, u8 uc_index)
         rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content));
+                 "rtl_cam_mark_invalid(): WRITE A4: %x\n", ul_content);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command));
+                 "rtl_cam_mark_invalid(): WRITE A0: %x\n", ul_command);
 }
 EXPORT_SYMBOL(rtl_cam_mark_invalid);
 
@@ -279,11 +274,11 @@ void rtl_cam_empty_entry(struct ieee80211_hw *hw, u8 uc_index)
                 rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], ul_command);
 
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                         ("rtl_cam_empty_entry(): WRITE A4: %x\n",
-                          ul_content));
+                         "rtl_cam_empty_entry(): WRITE A4: %x\n",
+                         ul_content);
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                         ("rtl_cam_empty_entry(): WRITE A0: %x\n",
-                          ul_command));
+                         "rtl_cam_empty_entry(): WRITE A0: %x\n",
+                         ul_command);
         }
 
 }
@@ -297,8 +292,7 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is NULL.\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
                 return TOTAL_CAM_ENTRY;
         }
         /* Does STA already exist? */
@@ -311,8 +305,8 @@ u8 rtl_cam_get_free_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         for (entry_idx = 4; entry_idx < TOTAL_CAM_ENTRY; entry_idx++) {
                 if ((bitmap & BIT(0)) == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                                ("-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",
-                                 rtlpriv->sec.hwsec_cam_bitmap, entry_idx));
+                                 "-----hwsec_cam_bitmap: 0x%x entry_idx=%d\n",
+                                 rtlpriv->sec.hwsec_cam_bitmap, entry_idx);
                         rtlpriv->sec.hwsec_cam_bitmap |= BIT(0) << entry_idx;
                         memcpy(rtlpriv->sec.hwsec_cam_sta_addr[entry_idx],
                                sta_addr, ETH_ALEN);
@@ -331,14 +325,13 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
         u8 i, *addr;
 
         if (NULL == sta_addr) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is NULL.\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG, "sta_addr is NULL\n");
         }
 
         if ((sta_addr[0]|sta_addr[1]|sta_addr[2]|sta_addr[3]|\
                                 sta_addr[4]|sta_addr[5]) == 0) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_EMERG,
-                        ("sta_addr is 00:00:00:00:00:00.\n"));
+                         "sta_addr is 00:00:00:00:00:00\n");
                 return;
         }
         /* Does STA already exist? */