Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/rtlwifi/rtl8192se/sw.c

224 files changed, 3837 insertions, 3627 deletions

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index d366dadcf86e..a339693fbe26 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -80,7 +80,7 @@ static bool modparam_fastchanswitch;
 module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO);
 MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios.");
 
-static int ath5k_modparam_no_hw_rfkill_switch;
+static bool ath5k_modparam_no_hw_rfkill_switch;
 module_param_named(no_hw_rfkill_switch, ath5k_modparam_no_hw_rfkill_switch,
                                                                 bool, S_IRUGO);
 MODULE_PARM_DESC(no_hw_rfkill_switch, "Ignore the GPIO RFKill switch state");
@@ -2442,6 +2442,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
                 BIT(NL80211_IFTYPE_ADHOC) |
                 BIT(NL80211_IFTYPE_MESH_POINT);
 
+        /* SW support for IBSS_RSN is provided by mac80211 */
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         /* both antennas can be configured as RX or TX */
         hw->wiphy->available_antennas_tx = 0x3;
         hw->wiphy->available_antennas_rx = 0x3;
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 6ed4c0717e3e..af4c7ecb4b30 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -483,6 +483,14 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         if (ath5k_modparam_nohwcrypt)
                 return -EOPNOTSUPP;
 
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /* don't program group keys when using IBSS_RSN */
+                return -EOPNOTSUPP;
+        }
+
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 77c8ded8de57..f317515d8bf3 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -968,8 +968,7 @@ static void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev)
         ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
 }
 
-static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
-                                     u32 drv_info)
+static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
 {
         int transfer, err;
         const void *data = hif_dev->firmware->data;
@@ -1000,7 +999,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
         }
         kfree(buf);
 
-        if (IS_AR7010_DEVICE(drv_info))
+        if (IS_AR7010_DEVICE(hif_dev->usb_device_id->driver_info))
                 firm_offset = AR7010_FIRMWARE_TEXT;
         else
                 firm_offset = AR9271_FIRMWARE_TEXT;
@@ -1021,28 +1020,18 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
         return 0;
 }
 
-static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, u32 drv_info)
+static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
 {
-        int ret, idx;
         struct usb_host_interface *alt = &hif_dev->interface->altsetting[0];
         struct usb_endpoint_descriptor *endp;
+        int ret, idx;
 
-        /* Request firmware */
-        ret = request_firmware(&hif_dev->firmware, hif_dev->fw_name,
-                               &hif_dev->udev->dev);
-        if (ret) {
-                dev_err(&hif_dev->udev->dev,
-                        "ath9k_htc: Firmware - %s not found\n", hif_dev->fw_name);
-                goto err_fw_req;
-        }
-
-        /* Download firmware */
-        ret = ath9k_hif_usb_download_fw(hif_dev, drv_info);
+        ret = ath9k_hif_usb_download_fw(hif_dev);
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
                         "ath9k_htc: Firmware - %s download failed\n",
                         hif_dev->fw_name);
-                goto err_fw_download;
+                return ret;
         }
 
         /* On downloading the firmware to the target, the USB descriptor of EP4
@@ -1064,23 +1053,84 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, u32 drv_info)
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
                         "ath9k_htc: Unable to allocate URBs\n");
-                goto err_fw_download;
+                return ret;
         }
 
         return 0;
-
-err_fw_download:
-        release_firmware(hif_dev->firmware);
-err_fw_req:
-        hif_dev->firmware = NULL;
-        return ret;
 }
 
 static void ath9k_hif_usb_dev_deinit(struct hif_device_usb *hif_dev)
 {
         ath9k_hif_usb_dealloc_urbs(hif_dev);
-        if (hif_dev->firmware)
-                release_firmware(hif_dev->firmware);
+}
+
+/*
+ * If initialization fails or the FW cannot be retrieved,
+ * detach the device.
+ */
+static void ath9k_hif_usb_firmware_fail(struct hif_device_usb *hif_dev)
+{
+        struct device *parent = hif_dev->udev->dev.parent;
+
+        complete(&hif_dev->fw_done);
+
+        if (parent)
+                device_lock(parent);
+
+        device_release_driver(&hif_dev->udev->dev);
+
+        if (parent)
+                device_unlock(parent);
+}
+
+static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context)
+{
+        struct hif_device_usb *hif_dev = context;
+        int ret;
+
+        if (!fw) {
+                dev_err(&hif_dev->udev->dev,
+                        "ath9k_htc: Failed to get firmware %s\n",
+                        hif_dev->fw_name);
+                goto err_fw;
+        }
+
+        hif_dev->htc_handle = ath9k_htc_hw_alloc(hif_dev, &hif_usb,
+                                                 &hif_dev->udev->dev);
+        if (hif_dev->htc_handle == NULL) {
+                goto err_fw;
+        }
+
+        hif_dev->firmware = fw;
+
+        /* Proceed with initialization */
+
+        ret = ath9k_hif_usb_dev_init(hif_dev);
+        if (ret)
+                goto err_dev_init;
+
+        ret = ath9k_htc_hw_init(hif_dev->htc_handle,
+                                &hif_dev->interface->dev,
+                                hif_dev->usb_device_id->idProduct,
+                                hif_dev->udev->product,
+                                hif_dev->usb_device_id->driver_info);
+        if (ret) {
+                ret = -EINVAL;
+                goto err_htc_hw_init;
+        }
+
+        complete(&hif_dev->fw_done);
+
+        return;
+
+err_htc_hw_init:
+        ath9k_hif_usb_dev_deinit(hif_dev);
+err_dev_init:
+        ath9k_htc_hw_free(hif_dev->htc_handle);
+        release_firmware(fw);
+        hif_dev->firmware = NULL;
+err_fw:
+        ath9k_hif_usb_firmware_fail(hif_dev);
 }
 
 /*
@@ -1155,20 +1205,16 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
         }
 
         usb_get_dev(udev);
+
         hif_dev->udev = udev;
         hif_dev->interface = interface;
-        hif_dev->device_id = id->idProduct;
+        hif_dev->usb_device_id = id;
 #ifdef CONFIG_PM
         udev->reset_resume = 1;
 #endif
         usb_set_intfdata(interface, hif_dev);
 
-        hif_dev->htc_handle = ath9k_htc_hw_alloc(hif_dev, &hif_usb,
-                                                 &hif_dev->udev->dev);
-        if (hif_dev->htc_handle == NULL) {
-                ret = -ENOMEM;
-                goto err_htc_hw_alloc;
-        }
+        init_completion(&hif_dev->fw_done);
 
         /* Find out which firmware to load */
 
@@ -1177,29 +1223,22 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
         else
                 hif_dev->fw_name = FIRMWARE_AR9271;
 
-        ret = ath9k_hif_usb_dev_init(hif_dev, id->driver_info);
-        if (ret) {
-                ret = -EINVAL;
-                goto err_hif_init_usb;
-        }
-
-        ret = ath9k_htc_hw_init(hif_dev->htc_handle,
-                                &interface->dev, hif_dev->device_id,
-                                hif_dev->udev->product, id->driver_info);
+        ret = request_firmware_nowait(THIS_MODULE, true, hif_dev->fw_name,
+                                      &hif_dev->udev->dev, GFP_KERNEL,
+                                      hif_dev, ath9k_hif_usb_firmware_cb);
         if (ret) {
-                ret = -EINVAL;
-                goto err_htc_hw_init;
+                dev_err(&hif_dev->udev->dev,
+                        "ath9k_htc: Async request for firmware %s failed\n",
+                        hif_dev->fw_name);
+                goto err_fw_req;
         }
 
-        dev_info(&hif_dev->udev->dev, "ath9k_htc: USB layer initialized\n");
+        dev_info(&hif_dev->udev->dev, "ath9k_htc: Firmware %s requested\n",
+                 hif_dev->fw_name);
 
         return 0;
 
-err_htc_hw_init:
-        ath9k_hif_usb_dev_deinit(hif_dev);
-err_hif_init_usb:
-        ath9k_htc_hw_free(hif_dev->htc_handle);
-err_htc_hw_alloc:
+err_fw_req:
         usb_set_intfdata(interface, NULL);
         kfree(hif_dev);
         usb_put_dev(udev);
@@ -1234,9 +1273,15 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface)
         if (!hif_dev)
                 return;
 
-        ath9k_htc_hw_deinit(hif_dev->htc_handle, unplugged);
-        ath9k_htc_hw_free(hif_dev->htc_handle);
-        ath9k_hif_usb_dev_deinit(hif_dev);
+        wait_for_completion(&hif_dev->fw_done);
+
+        if (hif_dev->firmware) {
+                ath9k_htc_hw_deinit(hif_dev->htc_handle, unplugged);
+                ath9k_htc_hw_free(hif_dev->htc_handle);
+                ath9k_hif_usb_dev_deinit(hif_dev);
+                release_firmware(hif_dev->firmware);
+        }
+
         usb_set_intfdata(interface, NULL);
 
         if (!unplugged && (hif_dev->flags & HIF_USB_START))
@@ -1276,8 +1321,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
                 return ret;
 
         if (hif_dev->firmware) {
-                ret = ath9k_hif_usb_download_fw(hif_dev,
-                                htc_handle->drv_priv->ah->hw_version.usbdev);
+                ret = ath9k_hif_usb_download_fw(hif_dev);
                 if (ret)
                         goto fail_resume;
         } else {
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 794f63094e5d..487ff658b4c1 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -87,10 +87,11 @@ struct cmd_buf {
 #define HIF_USB_START BIT(0)
 
 struct hif_device_usb {
-        u16 device_id;
         struct usb_device *udev;
         struct usb_interface *interface;
+        const struct usb_device_id *usb_device_id;
         const struct firmware *firmware;
+        struct completion fw_done;
         struct htc_target *htc_handle;
         struct hif_usb_tx tx;
         struct usb_anchor regout_submitted;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 9be10a2da1c2..fc7519c93390 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -741,6 +741,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         hw->queues = 4;
         hw->channel_change_time = 5000;
         hw->max_listen_interval = 10;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index ef4c60661290..06101b6bdeac 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1409,6 +1409,21 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw,
         if (htc_modparam_nohwcrypt)
                 return -ENOSPC;
 
+        if ((vif->type == NL80211_IFTYPE_ADHOC ||
+             vif->type == NL80211_IFTYPE_MESH_POINT) &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /*
+                 * For now, disable hw crypto for the RSN IBSS group keys. This
+                 * could be optimized in the future to use a modified key cache
+                 * design to support per-STA RX GTK, but until that gets
+                 * implemented, use of software crypto for group addressed
+                 * frames is a acceptable to allow RSN IBSS to be used.
+                 */
+                return -EOPNOTSUPP;
+        }
+
         mutex_lock(&priv->mutex);
         ath_dbg(common, CONFIG, "Set HW Key\n");
         ath9k_htc_ps_wakeup(priv);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4a00806e2852..ec82e926badc 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -340,9 +340,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
                 fastcc = false;
 
         ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
-                hchan->channel, !!(hchan->channelFlags & (CHANNEL_HT40MINUS |
-                                                          CHANNEL_HT40PLUS)),
-                fastcc);
+                hchan->channel, IS_CHAN_HT40(hchan), fastcc);
 
         r = ath9k_hw_reset(ah, hchan, caldata, fastcc);
         if (r) {
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index b3c3798fe513..635b592ad961 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
                 return rate;
 
         /* This should not happen */
-        WARN_ON(1);
+        WARN_ON_ONCE(1);
 
         rate = ath_rc_priv->valid_rate_index[0];
 
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 6cfbb419e2f6..0cea20e3e250 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -559,6 +559,7 @@ int carl9170_set_hwretry_limit(struct ar9170 *ar, const u32 max_retry);
 int carl9170_upload_key(struct ar9170 *ar, const u8 id, const u8 *mac,
         const u8 ktype, const u8 keyidx, const u8 *keydata, const int keylen);
 int carl9170_disable_key(struct ar9170 *ar, const u8 id);
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel);
 
 /* RX */
 void carl9170_rx(struct ar9170 *ar, void *buf, unsigned int len);
@@ -593,7 +594,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar);
 
 /* FW */
 int carl9170_parse_firmware(struct ar9170 *ar);
-int carl9170_fw_fix_eeprom(struct ar9170 *ar);
 
 extern struct ieee80211_rate __carl9170_ratetable[];
 extern int modparam_noht;
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 3de61adacd34..cffde8d9a521 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -389,39 +389,6 @@ carl9170_find_fw_desc(struct ar9170 *ar, const __u8 *fw_data, const size_t len)
         return (void *)&fw_data[scan - found];
 }
 
-int carl9170_fw_fix_eeprom(struct ar9170 *ar)
-{
-        const struct carl9170fw_fix_desc *fix_desc = NULL;
-        unsigned int i, n, off;
-        u32 *data = (void *)&ar->eeprom;
-
-        fix_desc = carl9170_fw_find_desc(ar, FIX_MAGIC,
-                sizeof(*fix_desc), CARL9170FW_FIX_DESC_CUR_VER);
-
-        if (!fix_desc)
-                return 0;
-
-        n = (le16_to_cpu(fix_desc->head.length) - sizeof(*fix_desc)) /
-            sizeof(struct carl9170fw_fix_entry);
-
-        for (i = 0; i < n; i++) {
-                off = le32_to_cpu(fix_desc->data[i].address) -
-                      AR9170_EEPROM_START;
-
-                if (off >= sizeof(struct ar9170_eeprom) || (off & 3)) {
-                        dev_err(&ar->udev->dev, "Skip invalid entry %d\n", i);
-                        continue;
-                }
-
-                data[off / sizeof(*data)] &=
-                        le32_to_cpu(fix_desc->data[i].mask);
-                data[off / sizeof(*data)] |=
-                        le32_to_cpu(fix_desc->data[i].value);
-        }
-
-        return 0;
-}
-
 int carl9170_parse_firmware(struct ar9170 *ar)
 {
         const struct carl9170fw_desc_head *fw_desc = NULL;
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index dfda91970995..53415bfd8bef 100644
--- a/drivers/net/wireless/ath/carl9170/mac.c
+++ b/drivers/net/wireless/ath/carl9170/mac.c
@@ -485,3 +485,38 @@ int carl9170_disable_key(struct ar9170 *ar, const u8 id)
         return carl9170_exec_cmd(ar, CARL9170_CMD_DKEY,
                 sizeof(key), (u8 *)&key, 0, NULL);
 }
+
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel)
+{
+        unsigned int power, chains;
+
+        if (ar->eeprom.tx_mask != 1)
+                chains = AR9170_TX_PHY_TXCHAIN_2;
+        else
+                chains = AR9170_TX_PHY_TXCHAIN_1;
+
+        switch (channel->band) {
+        case IEEE80211_BAND_2GHZ:
+                power = ar->power_2G_ofdm[0] & 0x3f;
+                break;
+        case IEEE80211_BAND_5GHZ:
+                power = ar->power_5G_leg[0] & 0x3f;
+                break;
+        default:
+                BUG_ON(1);
+        }
+
+        power = min_t(unsigned int, power, ar->hw->conf.power_level * 2);
+
+        carl9170_regwrite_begin(ar);
+        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
+                          0x3c1e | power << 20 | chains << 26);
+        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite_finish();
+        return carl9170_regwrite_result();
+}
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index db774212161b..8d2523b3f722 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -853,11 +853,6 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                /* TODO */
-                err = 0;
-        }
-
         if (changed & IEEE80211_CONF_CHANGE_SMPS) {
                 /* TODO */
                 err = 0;
@@ -891,6 +886,12 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
+        if (changed & IEEE80211_CONF_CHANGE_POWER) {
+                err = carl9170_set_mac_tpc(ar, ar->hw->conf.channel);
+                if (err)
+                        goto out;
+        }
+
 out:
         mutex_unlock(&ar->mutex);
         return err;
@@ -1796,6 +1797,9 @@ void *carl9170_alloc(size_t priv_size)
                 ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /* As IBSS Encryption is software-based, IBSS RSN is supported. */
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         return ar;
 
 err_nomem:
@@ -1931,10 +1935,6 @@ int carl9170_register(struct ar9170 *ar)
         if (err)
                 return err;
 
-        err = carl9170_fw_fix_eeprom(ar);
-        if (err)
-                return err;
-
         err = carl9170_parse_eeprom(ar);
         if (err)
                 return err;
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index 472efc7e3402..b72c09cf43a4 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1426,15 +1426,15 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
 #undef EDGES
 }
 
-static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
-                                  enum carl9170_bw bw)
+static void carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
+                                   enum carl9170_bw bw)
 {
         struct ar9170_calibration_target_power_legacy *ctpl;
         struct ar9170_calibration_target_power_ht *ctph;
         u8 *ctpres;
         int ntargets;
         int idx, i, n;
-        u8 ackpower, ackchains, f;
+        u8 f;
         u8 pwr_freqs[AR5416_MAX_NUM_TGT_PWRS];
 
         if (freq < 3000)
@@ -1523,32 +1523,6 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
 
         /* calc. conformance test limits and apply to ar->power*[] */
         carl9170_calc_ctl(ar, freq, bw);
-
-        /* set ACK/CTS TX power */
-        carl9170_regwrite_begin(ar);
-
-        if (ar->eeprom.tx_mask != 1)
-                ackchains = AR9170_TX_PHY_TXCHAIN_2;
-        else
-                ackchains = AR9170_TX_PHY_TXCHAIN_1;
-
-        if (freq < 3000)
-                ackpower = ar->power_2G_ofdm[0] & 0x3f;
-        else
-                ackpower = ar->power_5G_leg[0] & 0x3f;
-
-        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
-                          0x3c1e | ackpower << 20 | ackchains << 26);
-        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite_finish();
-        return carl9170_regwrite_result();
 }
 
 int carl9170_get_noisefloor(struct ar9170 *ar)
@@ -1712,7 +1686,9 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
         if (err)
                 return err;
 
-        err = carl9170_set_power_cal(ar, channel->center_freq, bw);
+        carl9170_set_power_cal(ar, channel->center_freq, bw);
+
+        err = carl9170_set_mac_tpc(ar, channel);
         if (err)
                 return err;
 
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index d19a9ee9d057..771e1a9294c5 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -719,6 +719,8 @@ static void carl9170_tx_rate_tpc_chains(struct ar9170 *ar,
                 else
                         *chains = AR9170_TX_PHY_TXCHAIN_2;
         }
+
+        *tpc = min_t(unsigned int, *tpc, ar->hw->conf.power_level * 2);
 }
 
 static __le32 carl9170_tx_physet(struct ar9170 *ar,
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 16e8f8058155..835462dc1206 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -999,6 +999,12 @@ static inline void b43_write16(struct b43_wldev *dev, u16 offset, u16 value)
         dev->dev->write16(dev->dev, offset, value);
 }
 
+static inline void b43_maskset16(struct b43_wldev *dev, u16 offset, u16 mask,
+                                 u16 set)
+{
+        b43_write16(dev, offset, (b43_read16(dev, offset) & mask) | set);
+}
+
 static inline u32 b43_read32(struct b43_wldev *dev, u16 offset)
 {
         return dev->dev->read32(dev->dev, offset);
@@ -1009,6 +1015,12 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value)
         dev->dev->write32(dev->dev, offset, value);
 }
 
+static inline void b43_maskset32(struct b43_wldev *dev, u16 offset, u32 mask,
+                                 u32 set)
+{
+        b43_write32(dev, offset, (b43_read32(dev, offset) & mask) | set);
+}
+
 static inline void b43_block_read(struct b43_wldev *dev, void *buffer,
                                  size_t count, u16 offset, u8 reg_width)
 {
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 23ffb1b9a86f..5189cf38123a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -580,22 +580,14 @@ void b43_tsf_read(struct b43_wldev *dev, u64 *tsf)
 
 static void b43_time_lock(struct b43_wldev *dev)
 {
-        u32 macctl;
-
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl |= B43_MACCTL_TBTTHOLD;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_TBTTHOLD);
         /* Commit the write */
         b43_read32(dev, B43_MMIO_MACCTL);
 }
 
 static void b43_time_unlock(struct b43_wldev *dev)
 {
-        u32 macctl;
-
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_TBTTHOLD;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_TBTTHOLD, 0);
         /* Commit the write */
         b43_read32(dev, B43_MMIO_MACCTL);
 }
@@ -2487,10 +2479,8 @@ static int b43_upload_microcode(struct b43_wldev *dev)
         b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_ALL);
 
         /* Start the microcode PSM */
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_JMP0;
-        macctl |= B43_MACCTL_PSM_RUN;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_JMP0,
+                      B43_MACCTL_PSM_RUN);
 
         /* Wait for the microcode to load and respond */
         i = 0;
@@ -2590,10 +2580,9 @@ static int b43_upload_microcode(struct b43_wldev *dev)
         return 0;
 
 error:
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_RUN;
-        macctl |= B43_MACCTL_PSM_JMP0;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        /* Stop the microcode PSM. */
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
+                      B43_MACCTL_PSM_JMP0);
 
         return err;
 }
@@ -2708,11 +2697,8 @@ static int b43_gpio_init(struct b43_wldev *dev)
         struct ssb_device *gpiodev;
         u32 mask, set;
 
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    & ~B43_MACCTL_GPOUTSMSK);
-
-        b43_write16(dev, B43_MMIO_GPIO_MASK, b43_read16(dev, B43_MMIO_GPIO_MASK)
-                    | 0x000F);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+        b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
 
         mask = 0x0000001F;
         set = 0x0000000F;
@@ -2800,9 +2786,7 @@ void b43_mac_enable(struct b43_wldev *dev)
         dev->mac_suspended--;
         B43_WARN_ON(dev->mac_suspended < 0);
         if (dev->mac_suspended == 0) {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            | B43_MACCTL_ENABLED);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_ENABLED);
                 b43_write32(dev, B43_MMIO_GEN_IRQ_REASON,
                             B43_IRQ_MAC_SUSPENDED);
                 /* Commit writes */
@@ -2823,9 +2807,7 @@ void b43_mac_suspend(struct b43_wldev *dev)
 
         if (dev->mac_suspended == 0) {
                 b43_power_saving_ctl_bits(dev, B43_PS_AWAKE);
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            & ~B43_MACCTL_ENABLED);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_ENABLED, 0);
                 /* force pci to flush the write */
                 b43_read32(dev, B43_MMIO_MACCTL);
                 for (i = 35; i; i--) {
@@ -2931,15 +2913,10 @@ static void b43_adjust_opmode(struct b43_wldev *dev)
          *        so always disable it. If we want to implement PMQ,
          *        we need to enable it here (clear DISCPMQ) in AP mode.
          */
-        if (0  /* ctl & B43_MACCTL_AP */) {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            & ~B43_MACCTL_DISCPMQ);
-        } else {
-                b43_write32(dev, B43_MMIO_MACCTL,
-                            b43_read32(dev, B43_MMIO_MACCTL)
-                            | B43_MACCTL_DISCPMQ);
-        }
+        if (0  /* ctl & B43_MACCTL_AP */)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_DISCPMQ, 0);
+        else
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_DISCPMQ);
 }
 
 static void b43_rate_memory_write(struct b43_wldev *dev, u16 rate, int is_ofdm)
@@ -3083,10 +3060,8 @@ static int b43_chip_init(struct b43_wldev *dev)
         if (dev->dev->core_rev < 5)
                 b43_write32(dev, 0x010C, 0x01000000);
 
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    & ~B43_MACCTL_INFRA);
-        b43_write32(dev, B43_MMIO_MACCTL, b43_read32(dev, B43_MMIO_MACCTL)
-                    | B43_MACCTL_INFRA);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_INFRA, 0);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~0, B43_MACCTL_INFRA);
 
         /* Probe Response Timeout value */
         /* FIXME: Default to 0, has to be set by ioctl probably... :-/ */
@@ -4564,8 +4539,6 @@ static void b43_set_pretbtt(struct b43_wldev *dev)
 /* Locking: wl->mutex */
 static void b43_wireless_core_exit(struct b43_wldev *dev)
 {
-        u32 macctl;
-
         B43_WARN_ON(dev && b43_status(dev) > B43_STAT_INITIALIZED);
         if (!dev || b43_status(dev) != B43_STAT_INITIALIZED)
                 return;
@@ -4576,10 +4549,8 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
         b43_set_status(dev, B43_STAT_UNINIT);
 
         /* Stop the microcode PSM. */
-        macctl = b43_read32(dev, B43_MMIO_MACCTL);
-        macctl &= ~B43_MACCTL_PSM_RUN;
-        macctl |= B43_MACCTL_PSM_JMP0;
-        b43_write32(dev, B43_MMIO_MACCTL, macctl);
+        b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_PSM_RUN,
+                      B43_MACCTL_PSM_JMP0);
 
         b43_dma_free(dev);
         b43_pio_free(dev);
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index bf5a43855358..108118820b36 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -85,22 +85,11 @@ static inline bool b43_nphy_ipa(struct b43_wldev *dev)
                 (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ));
 }
 
-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */
-static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RxCoreGetState */
+static u8 b43_nphy_get_rx_core_state(struct b43_wldev *dev)
 {
-        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
-                if (dev->phy.rev >= 6) {
-                        if (dev->dev->chip_id == 47162)
-                                return txpwrctrl_tx_gain_ipa_rev5;
-                        return txpwrctrl_tx_gain_ipa_rev6;
-                } else if (dev->phy.rev >= 5) {
-                        return txpwrctrl_tx_gain_ipa_rev5;
-                } else {
-                        return txpwrctrl_tx_gain_ipa;
-                }
-        } else {
-                return txpwrctrl_tx_gain_ipa_5g;
-        }
+        return (b43_phy_read(dev, B43_NPHY_RFSEQCA) & B43_NPHY_RFSEQCA_RXEN) >>
+                B43_NPHY_RFSEQCA_RXEN_SHIFT;
 }
 
 /**************************************************
@@ -229,7 +218,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
 
                 reg = (i == 0) ?
                         B43_NPHY_RFCTL_INTC1 : B43_NPHY_RFCTL_INTC2;
-                b43_phy_mask(dev, reg, 0xFBFF);
+                b43_phy_set(dev, reg, 0x400);
 
                 switch (field) {
                 case 0:
@@ -245,7 +234,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                                 b43_phy_set(dev, B43_NPHY_RFCTL_CMD,
                                                 B43_NPHY_RFCTL_CMD_START);
                                 for (j = 0; j < 100; j++) {
-                                        if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_START) {
+                                        if (!(b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_START)) {
                                                 j = 0;
                                                 break;
                                         }
@@ -264,7 +253,7 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
                                 b43_phy_set(dev, B43_NPHY_RFCTL_CMD,
                                                 B43_NPHY_RFCTL_CMD_RXTX);
                                 for (j = 0; j < 100; j++) {
-                                        if (b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_RXTX) {
+                                        if (!(b43_phy_read(dev, B43_NPHY_RFCTL_CMD) & B43_NPHY_RFCTL_CMD_RXTX)) {
                                                 j = 0;
                                                 break;
                                         }
@@ -1231,12 +1220,12 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
         u16 s[2];
 
         if (dev->phy.rev >= 3) {
-                save_regs_phy[0] = b43_phy_read(dev,
+                save_regs_phy[0] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);
+                save_regs_phy[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);
+                save_regs_phy[2] = b43_phy_read(dev,
                                                 B43_NPHY_RFCTL_LUT_TRSW_UP1);
-                save_regs_phy[1] = b43_phy_read(dev,
+                save_regs_phy[3] = b43_phy_read(dev,
                                                 B43_NPHY_RFCTL_LUT_TRSW_UP2);
-                save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);
-                save_regs_phy[3] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);
                 save_regs_phy[4] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER1);
                 save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);
                 save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0);
@@ -1285,12 +1274,12 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
                 b43_phy_write(dev, B43_NPHY_GPIO_SEL, save_regs_phy[8]);
 
         if (dev->phy.rev >= 3) {
+                b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[0]);
+                b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[1]);
                 b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP1,
-                                save_regs_phy[0]);
+                                save_regs_phy[2]);
                 b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_UP2,
-                                save_regs_phy[1]);
-                b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[2]);
-                b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[3]);
+                                save_regs_phy[3]);
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER1, save_regs_phy[4]);
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]);
                 b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]);
@@ -1308,6 +1297,186 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
         return out;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */
+static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
+{
+        struct b43_phy_n *nphy = dev->phy.n;
+
+        u16 saved_regs_phy_rfctl[2];
+        u16 saved_regs_phy[13];
+        u16 regs_to_store[] = {
+                B43_NPHY_AFECTL_OVER1, B43_NPHY_AFECTL_OVER,
+                B43_NPHY_AFECTL_C1, B43_NPHY_AFECTL_C2,
+                B43_NPHY_TXF_40CO_B1S1, B43_NPHY_RFCTL_OVER,
+                B43_NPHY_TXF_40CO_B1S0, B43_NPHY_TXF_40CO_B32S1,
+                B43_NPHY_RFCTL_CMD,
+                B43_NPHY_RFCTL_LUT_TRSW_UP1, B43_NPHY_RFCTL_LUT_TRSW_UP2,
+                B43_NPHY_RFCTL_RSSIO1, B43_NPHY_RFCTL_RSSIO2
+        };
+
+        u16 class;
+
+        u16 clip_state[2];
+        u16 clip_off[2] = { 0xFFFF, 0xFFFF };
+
+        u8 vcm_final = 0;
+        s8 offset[4];
+        s32 results[8][4] = { };
+        s32 results_min[4] = { };
+        s32 poll_results[4] = { };
+
+        u16 *rssical_radio_regs = NULL;
+        u16 *rssical_phy_regs = NULL;
+
+        u16 r; /* routing */
+        u8 rx_core_state;
+        u8 core, i, j;
+
+        class = b43_nphy_classifier(dev, 0, 0);
+        b43_nphy_classifier(dev, 7, 4);
+        b43_nphy_read_clip_detection(dev, clip_state);
+        b43_nphy_write_clip_detection(dev, clip_off);
+
+        saved_regs_phy_rfctl[0] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC1);
+        saved_regs_phy_rfctl[1] = b43_phy_read(dev, B43_NPHY_RFCTL_INTC2);
+        for (i = 0; i < ARRAY_SIZE(regs_to_store); i++)
+                saved_regs_phy[i] = b43_phy_read(dev, regs_to_store[i]);
+
+        b43_nphy_rf_control_intc_override(dev, 0, 0, 7);
+        b43_nphy_rf_control_intc_override(dev, 1, 1, 7);
+        b43_nphy_rf_control_override(dev, 0x1, 0, 0, false);
+        b43_nphy_rf_control_override(dev, 0x2, 1, 0, false);
+        b43_nphy_rf_control_override(dev, 0x80, 1, 0, false);
+        b43_nphy_rf_control_override(dev, 0x40, 1, 0, false);
+
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                b43_nphy_rf_control_override(dev, 0x20, 0, 0, false);
+                b43_nphy_rf_control_override(dev, 0x10, 1, 0, false);
+        } else {
+                b43_nphy_rf_control_override(dev, 0x10, 0, 0, false);
+                b43_nphy_rf_control_override(dev, 0x20, 1, 0, false);
+        }
+
+        rx_core_state = b43_nphy_get_rx_core_state(dev);
+        for (core = 0; core < 2; core++) {
+                if (!(rx_core_state & (1 << core)))
+                        continue;
+                r = core ? B2056_RX1 : B2056_RX0;
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, 2);
+                b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, 2);
+                for (i = 0; i < 8; i++) {
+                        b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
+                                        i << 2);
+                        b43_nphy_poll_rssi(dev, 2, results[i], 8);
+                }
+                for (i = 0; i < 4; i++) {
+                        s32 curr;
+                        s32 mind = 40;
+                        s32 minpoll = 249;
+                        u8 minvcm = 0;
+                        if (2 * core != i)
+                                continue;
+                        for (j = 0; j < 8; j++) {
+                                curr = results[j][i] * results[j][i] +
+                                        results[j][i + 1] * results[j][i];
+                                if (curr < mind) {
+                                        mind = curr;
+                                        minvcm = j;
+                                }
+                                if (results[j][i] < minpoll)
+                                        minpoll = results[j][i];
+                        }
+                        vcm_final = minvcm;
+                        results_min[i] = minpoll;
+                }
+                b43_radio_maskset(dev, r | B2056_RX_RSSI_MISC, 0xE3,
+                                  vcm_final << 2);
+                for (i = 0; i < 4; i++) {
+                        if (core != i / 2)
+                                continue;
+                        offset[i] = -results[vcm_final][i];
+                        if (offset[i] < 0)
+                                offset[i] = -((abs(offset[i]) + 4) / 8);
+                        else
+                                offset[i] = (offset[i] + 4) / 8;
+                        if (results_min[i] == 248)
+                                offset[i] = -32;
+                        b43_nphy_scale_offset_rssi(dev, 0, offset[i],
+                                                   (i / 2 == 0) ? 1 : 2,
+                                                   (i % 2 == 0) ? 0 : 1,
+                                                   2);
+                }
+        }
+        for (core = 0; core < 2; core++) {
+                if (!(rx_core_state & (1 << core)))
+                        continue;
+                for (i = 0; i < 2; i++) {
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 0, i);
+                        b43_nphy_scale_offset_rssi(dev, 0, 0, core + 1, 1, i);
+                        b43_nphy_poll_rssi(dev, i, poll_results, 8);
+                        for (j = 0; j < 4; j++) {
+                                if (j / 2 == core)
+                                        offset[j] = 232 - poll_results[j];
+                                if (offset[j] < 0)
+                                        offset[j] = -(abs(offset[j] + 4) / 8);
+                                else
+                                        offset[j] = (offset[j] + 4) / 8;
+                                b43_nphy_scale_offset_rssi(dev, 0,
+                                        offset[2 * core], core + 1, j % 2, i);
+                        }
+                }
+        }
+
+        b43_phy_write(dev, B43_NPHY_RFCTL_INTC1, saved_regs_phy_rfctl[0]);
+        b43_phy_write(dev, B43_NPHY_RFCTL_INTC2, saved_regs_phy_rfctl[1]);
+
+        b43_nphy_force_rf_sequence(dev, B43_RFSEQ_RESET2RX);
+
+        b43_phy_set(dev, B43_NPHY_TXF_40CO_B1S1, 0x1);
+        b43_phy_set(dev, B43_NPHY_RFCTL_CMD, B43_NPHY_RFCTL_CMD_START);
+        b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1, ~0x1);
+
+        b43_phy_set(dev, B43_NPHY_RFCTL_OVER, 0x1);
+        b43_phy_set(dev, B43_NPHY_RFCTL_CMD, B43_NPHY_RFCTL_CMD_RXTX);
+        b43_phy_mask(dev, B43_NPHY_TXF_40CO_B1S1, ~0x1);
+
+        for (i = 0; i < ARRAY_SIZE(regs_to_store); i++)
+                b43_phy_write(dev, regs_to_store[i], saved_regs_phy[i]);
+
+        /* Store for future configuration */
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_2G;
+                rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_2G;
+        } else {
+                rssical_radio_regs = nphy->rssical_cache.rssical_radio_regs_5G;
+                rssical_phy_regs = nphy->rssical_cache.rssical_phy_regs_5G;
+        }
+        rssical_radio_regs[0] = b43_radio_read(dev, 0x602B);
+        rssical_radio_regs[0] = b43_radio_read(dev, 0x702B);
+        rssical_phy_regs[0] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_Z);
+        rssical_phy_regs[1] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_Z);
+        rssical_phy_regs[2] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_Z);
+        rssical_phy_regs[3] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_Z);
+        rssical_phy_regs[4] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_X);
+        rssical_phy_regs[5] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_X);
+        rssical_phy_regs[6] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_X);
+        rssical_phy_regs[7] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_X);
+        rssical_phy_regs[8] = b43_phy_read(dev, B43_NPHY_RSSIMC_0I_RSSI_Y);
+        rssical_phy_regs[9] = b43_phy_read(dev, B43_NPHY_RSSIMC_0Q_RSSI_Y);
+        rssical_phy_regs[10] = b43_phy_read(dev, B43_NPHY_RSSIMC_1I_RSSI_Y);
+        rssical_phy_regs[11] = b43_phy_read(dev, B43_NPHY_RSSIMC_1Q_RSSI_Y);
+
+        /* Remember for which channel we store configuration */
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
+                nphy->rssical_chanspec_2G.center_freq = dev->phy.channel_freq;
+        else
+                nphy->rssical_chanspec_5G.center_freq = dev->phy.channel_freq;
+
+        /* End of calibration, restore configuration */
+        b43_nphy_classifier(dev, 7, class);
+        b43_nphy_write_clip_detection(dev, clip_state);
+}
+
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal */
 static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
 {
@@ -1472,12 +1641,6 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
         b43_nphy_reset_cca(dev);
 }
 
-/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICalRev3 */
-static void b43_nphy_rev3_rssi_cal(struct b43_wldev *dev)
-{
-        /* TODO */
-}
-
 /*
  * RSSI Calibration
  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/RSSICal
@@ -2229,27 +2392,12 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev)
         */
 
         for (i = 0; i < 2; i++) {
-                if (dev->phy.rev >= 3) {
-                        if (b43_nphy_ipa(dev)) {
-                                txgain = *(b43_nphy_get_ipa_gain_table(dev) +
-                                                txpi[i]);
-                        } else if (b43_current_band(dev->wl) ==
-                                   IEEE80211_BAND_5GHZ) {
-                                /* FIXME: use 5GHz tables */
-                                txgain =
-                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
-                        } else {
-                                if (dev->phy.rev >= 5 &&
-                                    sprom->fem.ghz5.extpa_gain == 3)
-                                        ; /* FIXME: 5GHz_txgain_HiPwrEPA */
-                                txgain =
-                                        b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];
-                        }
+                txgain = *(b43_nphy_get_tx_gain_table(dev) + txpi[i]);
+
+                if (dev->phy.rev >= 3)
                         radio_gain = (txgain >> 16) & 0x1FFFF;
-                } else {
-                        txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];
+                else
                         radio_gain = (txgain >> 16) & 0x1FFF;
-                }
 
                 if (dev->phy.rev >= 7)
                         dac_gain = (txgain >> 8) & 0x7;
@@ -2420,55 +2568,252 @@ static void b43_nphy_tx_power_ctl_idle_tssi(struct b43_wldev *dev)
         nphy->pwr_ctl_info[1].idle_tssi_2g = (tmp >> 8) & 0xFF;
 }
 
-static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)
+/* http://bcm-v4.sipsolutions.net/PHY/N/TxPwrLimitToTbl */
+static void b43_nphy_tx_prepare_adjusted_power_table(struct b43_wldev *dev)
 {
-        struct b43_phy *phy = &dev->phy;
+        struct b43_phy_n *nphy = dev->phy.n;
 
-        const u32 *table = NULL;
-#if 0
-        TODO: b43_ntab_papd_pga_gain_delta_ipa_2*
-        u32 rfpwr_offset;
-        u8 pga_gain;
-        int i;
-#endif
+        u8 idx, delta;
+        u8 i, stf_mode;
 
-        if (phy->rev >= 3) {
-                if (b43_nphy_ipa(dev)) {
-                        table = b43_nphy_get_ipa_gain_table(dev);
+        for (i = 0; i < 4; i++)
+                nphy->adj_pwr_tbl[i] = nphy->tx_power_offset[i];
+
+        for (stf_mode = 0; stf_mode < 4; stf_mode++) {
+                delta = 0;
+                switch (stf_mode) {
+                case 0:
+                        if (dev->phy.is_40mhz && dev->phy.rev >= 5) {
+                                idx = 68;
+                        } else {
+                                delta = 1;
+                                idx = dev->phy.is_40mhz ? 52 : 4;
+                        }
+                        break;
+                case 1:
+                        idx = dev->phy.is_40mhz ? 76 : 28;
+                        break;
+                case 2:
+                        idx = dev->phy.is_40mhz ? 84 : 36;
+                        break;
+                case 3:
+                        idx = dev->phy.is_40mhz ? 92 : 44;
+                        break;
+                }
+
+                for (i = 0; i < 20; i++) {
+                        nphy->adj_pwr_tbl[4 + 4 * i + stf_mode] =
+                                nphy->tx_power_offset[idx];
+                        if (i == 0)
+                                idx += delta;
+                        if (i == 14)
+                                idx += 1 - delta;
+                        if (i == 3 || i == 4 || i == 7 || i == 8 || i == 11 ||
+                            i == 13)
+                                idx += 1;
+                }
+        }
+}
+
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/TxPwrCtrlSetup */
+static void b43_nphy_tx_power_ctl_setup(struct b43_wldev *dev)
+{
+        struct b43_phy_n *nphy = dev->phy.n;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
+        s16 a1[2], b0[2], b1[2];
+        u8 idle[2];
+        s8 target[2];
+        s32 num, den, pwr;
+        u32 regval[64];
+
+        u16 freq = dev->phy.channel_freq;
+        u16 tmp;
+        u16 r; /* routing */
+        u8 i, c;
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12) {
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, 0x200000);
+                b43_read32(dev, B43_MMIO_MACCTL);
+                udelay(1);
+        }
+
+        if (nphy->hang_avoid)
+                b43_nphy_stay_in_carrier_search(dev, true);
+
+        b43_phy_set(dev, B43_NPHY_TSSIMODE, B43_NPHY_TSSIMODE_EN);
+        if (dev->phy.rev >= 3)
+                b43_phy_mask(dev, B43_NPHY_TXPCTL_CMD,
+                             ~B43_NPHY_TXPCTL_CMD_PCTLEN & 0xFFFF);
+        else
+                b43_phy_set(dev, B43_NPHY_TXPCTL_CMD,
+                            B43_NPHY_TXPCTL_CMD_PCTLEN);
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0x200000, 0);
+
+        if (sprom->revision < 4) {
+                idle[0] = nphy->pwr_ctl_info[0].idle_tssi_2g;
+                idle[1] = nphy->pwr_ctl_info[1].idle_tssi_2g;
+                target[0] = target[1] = 52;
+                a1[0] = a1[1] = -424;
+                b0[0] = b0[1] = 5612;
+                b1[0] = b1[1] = -1393;
+        } else {
+                if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_2g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_2g;
+                                a1[c] = sprom->core_pwr_info[c].pa_2g[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_2g[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_2g[2];
+                        }
+                } else if (freq >= 4900 && freq < 5100) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5gl;
+                                a1[c] = sprom->core_pwr_info[c].pa_5gl[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5gl[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5gl[2];
+                        }
+                } else if (freq >= 5100 && freq < 5500) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5g;
+                                a1[c] = sprom->core_pwr_info[c].pa_5g[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5g[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5g[2];
+                        }
+                } else if (freq >= 5500) {
+                        for (c = 0; c < 2; c++) {
+                                idle[c] = nphy->pwr_ctl_info[c].idle_tssi_5g;
+                                target[c] = sprom->core_pwr_info[c].maxpwr_5gh;
+                                a1[c] = sprom->core_pwr_info[c].pa_5gh[0];
+                                b0[c] = sprom->core_pwr_info[c].pa_5gh[1];
+                                b1[c] = sprom->core_pwr_info[c].pa_5gh[2];
+                        }
                 } else {
-                        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
-                                if (phy->rev == 3)
-                                        table = b43_ntab_tx_gain_rev3_5ghz;
-                                if (phy->rev == 4)
-                                        table = b43_ntab_tx_gain_rev4_5ghz;
-                                else
-                                        table = b43_ntab_tx_gain_rev5plus_5ghz;
+                        idle[0] = nphy->pwr_ctl_info[0].idle_tssi_5g;
+                        idle[1] = nphy->pwr_ctl_info[1].idle_tssi_5g;
+                        target[0] = target[1] = 52;
+                        a1[0] = a1[1] = -424;
+                        b0[0] = b0[1] = 5612;
+                        b1[0] = b1[1] = -1393;
+                }
+        }
+        /* target[0] = target[1] = nphy->tx_power_max; */
+
+        if (dev->phy.rev >= 3) {
+                if (sprom->fem.ghz2.tssipos)
+                        b43_phy_set(dev, B43_NPHY_TXPCTL_ITSSI, 0x4000);
+                if (dev->phy.rev >= 7) {
+                        for (c = 0; c < 2; c++) {
+                                r = c ? 0x190 : 0x170;
+                                if (b43_nphy_ipa(dev))
+                                        b43_radio_write(dev, r + 0x9, (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) ? 0xE : 0xC);
+                        }
+                } else {
+                        if (b43_nphy_ipa(dev)) {
+                                tmp = (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) ? 0xC : 0xE;
+                                b43_radio_write(dev,
+                                        B2056_TX0 | B2056_TX_TX_SSI_MUX, tmp);
+                                b43_radio_write(dev,
+                                        B2056_TX1 | B2056_TX_TX_SSI_MUX, tmp);
                         } else {
-                                table = b43_ntab_tx_gain_rev3plus_2ghz;
+                                b43_radio_write(dev,
+                                        B2056_TX0 | B2056_TX_TX_SSI_MUX, 0x11);
+                                b43_radio_write(dev,
+                                        B2056_TX1 | B2056_TX_TX_SSI_MUX, 0x11);
                         }
                 }
+        }
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12) {
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0, 0x200000);
+                b43_read32(dev, B43_MMIO_MACCTL);
+                udelay(1);
+        }
+
+        if (dev->phy.rev >= 7) {
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,
+                                ~B43_NPHY_TXPCTL_CMD_INIT, 0x19);
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,
+                                ~B43_NPHY_TXPCTL_INIT_PIDXI1, 0x19);
         } else {
-                table = b43_ntab_tx_gain_rev0_1_2;
+                b43_phy_maskset(dev, B43_NPHY_TXPCTL_CMD,
+                                ~B43_NPHY_TXPCTL_CMD_INIT, 0x40);
+                if (dev->phy.rev > 1)
+                        b43_phy_maskset(dev, B43_NPHY_TXPCTL_INIT,
+                                ~B43_NPHY_TXPCTL_INIT_PIDXI1, 0x40);
+        }
+
+        if (dev->dev->core_rev == 11 || dev->dev->core_rev == 12)
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~0x200000, 0);
+
+        b43_phy_write(dev, B43_NPHY_TXPCTL_N,
+                      0xF0 << B43_NPHY_TXPCTL_N_TSSID_SHIFT |
+                      3 << B43_NPHY_TXPCTL_N_NPTIL2_SHIFT);
+        b43_phy_write(dev, B43_NPHY_TXPCTL_ITSSI,
+                      idle[0] << B43_NPHY_TXPCTL_ITSSI_0_SHIFT |
+                      idle[1] << B43_NPHY_TXPCTL_ITSSI_1_SHIFT |
+                      B43_NPHY_TXPCTL_ITSSI_BINF);
+        b43_phy_write(dev, B43_NPHY_TXPCTL_TPWR,
+                      target[0] << B43_NPHY_TXPCTL_TPWR_0_SHIFT |
+                      target[1] << B43_NPHY_TXPCTL_TPWR_1_SHIFT);
+
+        for (c = 0; c < 2; c++) {
+                for (i = 0; i < 64; i++) {
+                        num = 8 * (16 * b0[c] + b1[c] * i);
+                        den = 32768 + a1[c] * i;
+                        pwr = max((4 * num + den / 2) / den, -8);
+                        if (dev->phy.rev < 3 && (i <= (31 - idle[c] + 1)))
+                                pwr = max(pwr, target[c] + 1);
+                        regval[i] = pwr;
+                }
+                b43_ntab_write_bulk(dev, B43_NTAB32(26 + c, 0), 64, regval);
         }
+
+        b43_nphy_tx_prepare_adjusted_power_table(dev);
+        /*
+        b43_ntab_write_bulk(dev, B43_NTAB16(26, 64), 84, nphy->adj_pwr_tbl);
+        b43_ntab_write_bulk(dev, B43_NTAB16(27, 64), 84, nphy->adj_pwr_tbl);
+        */
+
+        if (nphy->hang_avoid)
+                b43_nphy_stay_in_carrier_search(dev, false);
+}
+
+static void b43_nphy_tx_gain_table_upload(struct b43_wldev *dev)
+{
+        struct b43_phy *phy = &dev->phy;
+
+        const u32 *table = NULL;
+        u32 rfpwr_offset;
+        u8 pga_gain;
+        int i;
+
+        table = b43_nphy_get_tx_gain_table(dev);
         b43_ntab_write_bulk(dev, B43_NTAB32(26, 192), 128, table);
         b43_ntab_write_bulk(dev, B43_NTAB32(27, 192), 128, table);
 
         if (phy->rev >= 3) {
 #if 0
                 nphy->gmval = (table[0] >> 16) & 0x7000;
+#endif
 
                 for (i = 0; i < 128; i++) {
                         pga_gain = (table[i] >> 24) & 0xF;
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
-                                rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];
+                                rfpwr_offset =
+                                 b43_ntab_papd_pga_gain_delta_ipa_2g[pga_gain];
                         else
-                                rfpwr_offset = b43_ntab_papd_pga_gain_delta_ipa_5g[pga_gain];
+                                rfpwr_offset =
+                                 0; /* FIXME */
                         b43_ntab_write(dev, B43_NTAB32(26, 576 + i),
                                        rfpwr_offset);
                         b43_ntab_write(dev, B43_NTAB32(27, 576 + i),
                                        rfpwr_offset);
                 }
-#endif
         }
 }
 
@@ -3139,32 +3484,13 @@ static struct nphy_txgains b43_nphy_get_tx_gains(struct b43_wldev *dev)
                         B43_NPHY_TXPCTL_STAT_BIDX_SHIFT;
 
                 for (i = 0; i < 2; ++i) {
+                        table = b43_nphy_get_tx_gain_table(dev);
                         if (dev->phy.rev >= 3) {
-                                enum ieee80211_band band =
-                                        b43_current_band(dev->wl);
-
-                                if (b43_nphy_ipa(dev)) {
-                                        table = b43_nphy_get_ipa_gain_table(dev);
-                                } else {
-                                        if (band == IEEE80211_BAND_5GHZ) {
-                                                if (dev->phy.rev == 3)
-                                                        table = b43_ntab_tx_gain_rev3_5ghz;
-                                                else if (dev->phy.rev == 4)
-                                                        table = b43_ntab_tx_gain_rev4_5ghz;
-                                                else
-                                                        table = b43_ntab_tx_gain_rev5plus_5ghz;
-                                        } else {
-                                                table = b43_ntab_tx_gain_rev3plus_2ghz;
-                                        }
-                                }
-
                                 target.ipa[i] = (table[index[i]] >> 16) & 0xF;
                                 target.pad[i] = (table[index[i]] >> 20) & 0xF;
                                 target.pga[i] = (table[index[i]] >> 24) & 0xF;
                                 target.txgm[i] = (table[index[i]] >> 28) & 0xF;
                         } else {
-                                table = b43_ntab_tx_gain_rev0_1_2;
-
                                 target.ipa[i] = (table[index[i]] >> 16) & 0x3;
                                 target.pad[i] = (table[index[i]] >> 18) & 0x3;
                                 target.pga[i] = (table[index[i]] >> 20) & 0x7;
@@ -3968,13 +4294,10 @@ static void b43_nphy_superswitch_init(struct b43_wldev *dev, bool init)
 #endif
                 }
 
-                b43_write32(dev, B43_MMIO_MACCTL,
-                        b43_read32(dev, B43_MMIO_MACCTL) &
-                        ~B43_MACCTL_GPOUTSMSK);
-                b43_write16(dev, B43_MMIO_GPIO_MASK,
-                        b43_read16(dev, B43_MMIO_GPIO_MASK) | 0xFC00);
-                b43_write16(dev, B43_MMIO_GPIO_CONTROL,
-                        b43_read16(dev, B43_MMIO_GPIO_CONTROL) & ~0xFC00);
+                b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
+                b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xFC00);
+                b43_maskset16(dev, B43_MMIO_GPIO_CONTROL, (~0xFC00 & 0xFFFF),
+                              0);
 
                 if (init) {
                         b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8);
@@ -4110,7 +4433,7 @@ int b43_phy_initn(struct b43_wldev *dev)
         b43_nphy_tx_power_ctrl(dev, false);
         b43_nphy_tx_power_fix(dev);
         b43_nphy_tx_power_ctl_idle_tssi(dev);
-        /* TODO N PHY TX Power Control Setup */
+        b43_nphy_tx_power_ctl_setup(dev);
         b43_nphy_tx_gain_table_upload(dev);
 
         if (nphy->phyrxchain != 3)
@@ -4530,8 +4853,7 @@ static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
 {
         check_phyreg(dev, reg);
         b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
-        b43_write16(dev, B43_MMIO_PHY_DATA,
-                    (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
+        b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
 }
 
 static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 5de8f74cc02f..fd12b386fea1 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -798,6 +798,7 @@ struct b43_phy_n {
         bool txpwrctrl;
         bool pwg_gain_5ghz;
         u8 tx_pwr_idx[2];
+        s8 tx_power_offset[101];
         u16 adj_pwr_tbl[84];
         u16 txcal_bbmult;
         u16 txiqlocal_bestc[11];
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index f7def13524dd..f0d8377429c6 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -2214,7 +2214,7 @@ static const u16 b43_ntab_antswctl2g_r3[4][32] = {
 };
 
 /* TX gain tables */
-const u32 b43_ntab_tx_gain_rev0_1_2[] = {
+static const u32 b43_ntab_tx_gain_rev0_1_2[] = {
         0x03cc2b44, 0x03cc2b42, 0x03cc2a44, 0x03cc2a42,
         0x03cc2944, 0x03c82b44, 0x03c82b42, 0x03c82a44,
         0x03c82a42, 0x03c82944, 0x03c82942, 0x03c82844,
@@ -2249,7 +2249,7 @@ const u32 b43_ntab_tx_gain_rev0_1_2[] = {
         0x03801442, 0x03801344, 0x03801342, 0x00002b00,
 };
 
-const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
+static const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
         0x1f410044, 0x1f410042, 0x1f410040, 0x1f41003e,
         0x1f41003c, 0x1f41003b, 0x1f410039, 0x1f410037,
         0x1e410044, 0x1e410042, 0x1e410040, 0x1e41003e,
@@ -2284,7 +2284,7 @@ const u32 b43_ntab_tx_gain_rev3plus_2ghz[] = {
         0x1041003c, 0x1041003b, 0x10410039, 0x10410037,
 };
 
-const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
         0xcff70044, 0xcff70042, 0xcff70040, 0xcff7003e,
         0xcff7003c, 0xcff7003b, 0xcff70039, 0xcff70037,
         0xcef70044, 0xcef70042, 0xcef70040, 0xcef7003e,
@@ -2319,7 +2319,7 @@ const u32 b43_ntab_tx_gain_rev3_5ghz[] = {
         0xc0f7003c, 0xc0f7003b, 0xc0f70039, 0xc0f70037,
 };
 
-const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
         0x2ff20044, 0x2ff20042, 0x2ff20040, 0x2ff2003e,
         0x2ff2003c, 0x2ff2003b, 0x2ff20039, 0x2ff20037,
         0x2ef20044, 0x2ef20042, 0x2ef20040, 0x2ef2003e,
@@ -2354,7 +2354,7 @@ const u32 b43_ntab_tx_gain_rev4_5ghz[] = {
         0x20d2003a, 0x20d20038, 0x20d20036, 0x20d20034,
 };
 
-const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
+static const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
         0x0f62004a, 0x0f620048, 0x0f620046, 0x0f620044,
         0x0f620042, 0x0f620040, 0x0f62003e, 0x0f62003c,
         0x0e620044, 0x0e620042, 0x0e620040, 0x0e62003e,
@@ -2389,7 +2389,7 @@ const u32 b43_ntab_tx_gain_rev5plus_5ghz[] = {
         0x0062003b, 0x00620039, 0x00620037, 0x00620035,
 };
 
-const u32 txpwrctrl_tx_gain_ipa[] = {
+static const u32 txpwrctrl_tx_gain_ipa[] = {
         0x5ff7002d, 0x5ff7002b, 0x5ff7002a, 0x5ff70029,
         0x5ff70028, 0x5ff70027, 0x5ff70026, 0x5ff70025,
         0x5ef7002d, 0x5ef7002b, 0x5ef7002a, 0x5ef70029,
@@ -2424,7 +2424,7 @@ const u32 txpwrctrl_tx_gain_ipa[] = {
         0x50f70028, 0x50f70027, 0x50f70026, 0x50f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
+static const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
         0x1ff7002d, 0x1ff7002b, 0x1ff7002a, 0x1ff70029,
         0x1ff70028, 0x1ff70027, 0x1ff70026, 0x1ff70025,
         0x1ef7002d, 0x1ef7002b, 0x1ef7002a, 0x1ef70029,
@@ -2459,7 +2459,7 @@ const u32 txpwrctrl_tx_gain_ipa_rev5[] = {
         0x10f70028, 0x10f70027, 0x10f70026, 0x10f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
+static const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
         0x0ff7002d, 0x0ff7002b, 0x0ff7002a, 0x0ff70029,
         0x0ff70028, 0x0ff70027, 0x0ff70026, 0x0ff70025,
         0x0ef7002d, 0x0ef7002b, 0x0ef7002a, 0x0ef70029,
@@ -2494,7 +2494,7 @@ const u32 txpwrctrl_tx_gain_ipa_rev6[] = {
         0x00f70028, 0x00f70027, 0x00f70026, 0x00f70025,
 };
 
-const u32 txpwrctrl_tx_gain_ipa_5g[] = {
+static const u32 txpwrctrl_tx_gain_ipa_5g[] = {
         0x7ff70035, 0x7ff70033, 0x7ff70032, 0x7ff70031,
         0x7ff7002f, 0x7ff7002e, 0x7ff7002d, 0x7ff7002b,
         0x7ff7002a, 0x7ff70029, 0x7ff70028, 0x7ff70027,
@@ -2529,6 +2529,11 @@ const u32 txpwrctrl_tx_gain_ipa_5g[] = {
         0x70f70021, 0x70f70020, 0x70f70020, 0x70f7001f,
 };
 
+const s8 b43_ntab_papd_pga_gain_delta_ipa_2g[] = {
+        -114, -108, -98, -91, -84, -78, -70, -62,
+        -54, -46, -39, -31, -23, -15, -8, 0
+};
+
 const u16 tbl_iqcal_gainparams[2][9][8] = {
         {
                 { 0x000, 0, 0, 2, 0x69, 0x69, 0x69, 0x69 },
@@ -2739,11 +2744,11 @@ const struct nphy_rf_control_override_rev3 tbl_rf_control_override_rev3[] = {
         { 0x0001,  0, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0002 (fls 2) */
         { 0x0002,  1, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0004 (fls 3) */
         { 0x0004,  2, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0008 (fls 4) */
-        { 0x0016,  4, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0010 (fls 5) */
+        { 0x0010,  4, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0010 (fls 5) */
         { 0x0020,  5, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0020 (fls 6) */
         { 0x0040,  6, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0040 (fls 7) */
-        { 0x0080,  6, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0080 (fls 8) */
-        { 0x0100,  7, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0100 (fls 9) */
+        { 0x0080,  7, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0080 (fls 8) */
+        { 0x0100,  8, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0100 (fls 9) */
         { 0x0007,  0, 0xE7, 0xF8, 0xEC, 0xFA }, /* field == 0x0200 (fls 10) */
         { 0x0070,  4, 0xE7, 0xF8, 0xEC, 0xFA }, /* field == 0x0400 (fls 11) */
         { 0xE000, 13, 0xE7, 0x7A, 0xEC, 0x7D }, /* field == 0x0800 (fls 12) */
@@ -3126,6 +3131,53 @@ void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev)
                 B43_WARN_ON(1);
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/GetIpaGainTbl */
+static const u32 *b43_nphy_get_ipa_gain_table(struct b43_wldev *dev)
+{
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
+                if (dev->phy.rev >= 6) {
+                        if (dev->dev->chip_id == 47162)
+                                return txpwrctrl_tx_gain_ipa_rev5;
+                        return txpwrctrl_tx_gain_ipa_rev6;
+                } else if (dev->phy.rev >= 5) {
+                        return txpwrctrl_tx_gain_ipa_rev5;
+                } else {
+                        return txpwrctrl_tx_gain_ipa;
+                }
+        } else {
+                return txpwrctrl_tx_gain_ipa_5g;
+        }
+}
+
+const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev)
+{
+        enum ieee80211_band band = b43_current_band(dev->wl);
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
+
+        if (dev->phy.rev < 3)
+                return b43_ntab_tx_gain_rev0_1_2;
+
+        /* rev 3+ */
+        if ((dev->phy.n->ipa2g_on && band == IEEE80211_BAND_2GHZ) ||
+            (dev->phy.n->ipa5g_on && band == IEEE80211_BAND_5GHZ)) {
+                return b43_nphy_get_ipa_gain_table(dev);
+        } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ) {
+                if (dev->phy.rev == 3)
+                        return b43_ntab_tx_gain_rev3_5ghz;
+                if (dev->phy.rev == 4)
+                        return sprom->fem.ghz5.extpa_gain == 3 ?
+                                b43_ntab_tx_gain_rev4_5ghz :
+                                b43_ntab_tx_gain_rev4_5ghz; /* FIXME */
+                else
+                        return b43_ntab_tx_gain_rev5plus_5ghz;
+        } else {
+                if (dev->phy.rev >= 5 && sprom->fem.ghz5.extpa_gain == 3)
+                        return b43_ntab_tx_gain_rev3plus_2ghz; /* FIXME */
+                else
+                        return b43_ntab_tx_gain_rev3plus_2ghz;
+        }
+}
+
 struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
         struct b43_wldev *dev, bool ghz5, bool ext_lna)
 {
diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/b43/tables_nphy.h
index 97038c481930..f348953c0230 100644
--- a/drivers/net/wireless/b43/tables_nphy.h
+++ b/drivers/net/wireless/b43/tables_nphy.h
@@ -177,16 +177,10 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,
 void b43_nphy_rev0_1_2_tables_init(struct b43_wldev *dev);
 void b43_nphy_rev3plus_tables_init(struct b43_wldev *dev);
 
-extern const u32 b43_ntab_tx_gain_rev0_1_2[];
-extern const u32 b43_ntab_tx_gain_rev3plus_2ghz[];
-extern const u32 b43_ntab_tx_gain_rev3_5ghz[];
-extern const u32 b43_ntab_tx_gain_rev4_5ghz[];
-extern const u32 b43_ntab_tx_gain_rev5plus_5ghz[];
-
-extern const u32 txpwrctrl_tx_gain_ipa[];
-extern const u32 txpwrctrl_tx_gain_ipa_rev5[];
-extern const u32 txpwrctrl_tx_gain_ipa_rev6[];
-extern const u32 txpwrctrl_tx_gain_ipa_5g[];
+const u32 *b43_nphy_get_tx_gain_table(struct b43_wldev *dev);
+
+extern const s8 b43_ntab_papd_pga_gain_delta_ipa_2g[];
+
 extern const u16 tbl_iqcal_gainparams[2][9][8];
 extern const struct nphy_txiqcal_ladder ladder_lo[];
 extern const struct nphy_txiqcal_ladder ladder_iq[];
diff --git a/drivers/net/wireless/brcm80211/Makefile b/drivers/net/wireless/brcm80211/Makefile
index f41c047eca82..b987920e982e 100644
--- a/drivers/net/wireless/brcm80211/Makefile
+++ b/drivers/net/wireless/brcm80211/Makefile
@@ -16,7 +16,7 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 # common flags
-subdir-ccflags-$(CONFIG_BRCMDBG)        += -DBCMDBG
+subdir-ccflags-$(CONFIG_BRCMDBG)        += -DDEBUG
 
 obj-$(CONFIG_BRCMUTIL)  += brcmutil/
 obj-$(CONFIG_BRCMFMAC)  += brcmfmac/
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 4bc8d251acf8..e925290b432b 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,6 +15,8 @@
  */
 /* ****************** SDIO CARD Interface Functions **************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/export.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 9b8c0ed833d4..ac71adeece51 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -13,6 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/sdio.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index e58ea40a75b0..07686a748d3c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -644,9 +644,9 @@ extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);
 extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
                                        uint cmd, void *buf, uint len);
 
-#ifdef BCMDBG
+#ifdef DEBUG
 extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);
 extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index ac8d1f437888..b3e3b7f25d82 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -19,6 +19,8 @@
  * For certain dcmd codes, the dongle interprets string data from the host.
  ******************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index a51d8f5d36fc..4187435220f3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -13,6 +13,9 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/sched.h>
@@ -38,7 +41,7 @@
 #define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN      \
         offsetof(struct brcmf_pkt_filter_pattern_le, mask_and_pattern)
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static const char brcmf_version[] =
         "Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on "
         __DATE__ " at " __TIME__;
@@ -133,7 +136,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
         return p != NULL;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static void
 brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
 {
@@ -399,10 +402,10 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
                 p = (char *)&buf[sizeof(struct msgtrace_hdr)];
                 while ((s = strstr(p, "\n")) != NULL) {
                         *s = '\0';
-                        printk(KERN_DEBUG"%s\n", p);
+                        pr_debug("%s\n", p);
                         p = s + 1;
                 }
-                printk(KERN_DEBUG "%s\n", p);
+                pr_debug("%s\n", p);
 
                 /* Reset datalen to avoid display below */
                 datalen = 0;
@@ -430,7 +433,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
                 brcmf_dbg(EVENT, "\n");
         }
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 int
 brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
@@ -518,9 +521,9 @@ brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
                 break;
         }
 
-#ifdef BCMDBG
+#ifdef DEBUG
         brcmf_c_show_host_event(event, event_data);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         return 0;
 }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index bb26ee36bc68..a2c4576cf9ff 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -32,20 +32,20 @@
 #define BRCMF_BTA_VAL   0x1000
 #define BRCMF_ISCAN_VAL 0x2000
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 
 #define brcmf_dbg(level, fmt, ...)                                      \
 do {                                                                    \
         if (BRCMF_ERROR_VAL == BRCMF_##level##_VAL) {                   \
                 if (brcmf_msg_level & BRCMF_##level##_VAL) {            \
                         if (net_ratelimit())                            \
-                                printk(KERN_DEBUG "%s: " fmt,           \
-                                       __func__, ##__VA_ARGS__);        \
+                                pr_debug("%s: " fmt,                    \
+                                         __func__, ##__VA_ARGS__);      \
                 }                                                       \
         } else {                                                        \
                 if (brcmf_msg_level & BRCMF_##level##_VAL) {            \
-                        printk(KERN_DEBUG "%s: " fmt,                   \
-                               __func__, ##__VA_ARGS__);                \
+                        pr_debug("%s: " fmt,                            \
+                                 __func__, ##__VA_ARGS__);              \
                 }                                                       \
         }                                                               \
 } while (0)
@@ -56,7 +56,7 @@ do {									\
 #define BRCMF_BYTES_ON()        (brcmf_msg_level & BRCMF_BYTES_VAL)
 #define BRCMF_GLOM_ON()         (brcmf_msg_level & BRCMF_GLOM_VAL)
 
-#else   /* (defined BCMDBG) || (defined BCMDBG) */
+#else   /* (defined DEBUG) || (defined DEBUG) */
 
 #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
 
@@ -66,7 +66,13 @@ do {									\
 #define BRCMF_BYTES_ON()        0
 #define BRCMF_GLOM_ON()         0
 
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
+
+#define brcmf_dbg_hex_dump(test, data, len, fmt, ...)                   \
+do {                                                                    \
+        if (test)                                                       \
+                brcmu_dbg_hex_dump(data, len, fmt, ##__VA_ARGS__);      \
+} while (0)
 
 extern int brcmf_msg_level;
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index eb9eb766ac27..db2df1f1e6b2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -590,8 +592,8 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
         sprintf(info->bus_info, "%s", dev_name(drvr->dev));
 }
 
-static struct ethtool_ops brcmf_ethtool_ops = {
-        .get_drvinfo = brcmf_ethtool_get_drvinfo
+static const struct ethtool_ops brcmf_ethtool_ops = {
+        .get_drvinfo = brcmf_ethtool_get_drvinfo,
 };
 
 static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)
@@ -1146,7 +1148,7 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev)
         return pend;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)
 {
         int ret = 0;
@@ -1180,4 +1182,4 @@ exit:
 
         return ret;
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index f7eeee1dcdb6..6e4b5e85a099 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -40,7 +42,7 @@
 
 #define DCMD_RESP_TIMEOUT  2000 /* In milli second */
 
-#ifdef BCMDBG
+#ifdef DEBUG
 
 #define BRCMF_TRAP_INFO_SIZE    80
 
@@ -84,7 +86,7 @@ struct rte_console {
         char cbuf[CBUF_LEN];
 };
 
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 #include <chipcommon.h>
 
 #include "dhd_bus.h"
@@ -416,7 +418,7 @@ struct sdpcmd_regs {
         u16 PAD[0x80];
 };
 
-#ifdef BCMDBG
+#ifdef DEBUG
 /* Device console log buffer state */
 struct brcmf_console {
         uint count;             /* Poll interval msec counter */
@@ -426,7 +428,7 @@ struct brcmf_console {
         u8 *buf;                /* Log buffer (host copy) */
         uint last;              /* Last buffer read index */
 };
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 struct sdpcm_shared {
         u32 flags;
@@ -507,11 +509,11 @@ struct brcmf_sdio {
         uint polltick;          /* Tick counter */
         uint pollcnt;           /* Count of active polls */
 
-#ifdef BCMDBG
+#ifdef DEBUG
         uint console_interval;
         struct brcmf_console console;   /* Console output polling support */
         uint console_addr;      /* Console address from shared struct */
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         uint regfails;          /* Count of R_REG failures */
 
@@ -587,10 +589,10 @@ struct brcmf_sdio {
 #define CLK_PENDING     2       /* Not used yet */
 #define CLK_AVAIL       3
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static int qcount[NUMPRIO];
 static int tx_packets[NUMPRIO];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define SDIO_DRIVE_STRENGTH     6       /* in milliamps */
 
@@ -764,12 +766,12 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok)
                 bus->clkstate = CLK_AVAIL;
                 brcmf_dbg(INFO, "CLKCTL: turned ON\n");
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
                 if (bus->alp_only != true) {
                         if (SBSDIO_ALPONLY(clkctl))
                                 brcmf_dbg(ERROR, "HT Clock should be on\n");
                 }
-#endif                          /* defined (BCMDBG) */
+#endif                          /* defined (DEBUG) */
 
                 bus->activity = true;
         } else {
@@ -814,9 +816,9 @@ static int brcmf_sdbrcm_sdclk(struct brcmf_sdio *bus, bool on)
 /* Transition SD and backplane clock readiness */
 static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
 {
-#ifdef BCMDBG
+#ifdef DEBUG
         uint oldstate = bus->clkstate;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -861,9 +863,9 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok)
                 brcmf_sdbrcm_wd_timer(bus, 0);
                 break;
         }
-#ifdef BCMDBG
+#ifdef DEBUG
         brcmf_dbg(INFO, "%d -> %d\n", oldstate, bus->clkstate);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         return 0;
 }
@@ -1279,13 +1281,10 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         }
                         return 0;
                 }
-#ifdef BCMDBG
-                if (BRCMF_GLOM_ON()) {
-                        printk(KERN_DEBUG "SUPERFRAME:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                pfirst->data, min_t(int, pfirst->len, 48));
-                }
-#endif
+
+                brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                   pfirst->data, min_t(int, pfirst->len, 48),
+                                   "SUPERFRAME:\n");
 
                 /* Validate the superframe header */
                 dptr = (u8 *) (pfirst->data);
@@ -1362,13 +1361,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         check = get_unaligned_le16(dptr + sizeof(u16));
                         chan = SDPCM_PACKET_CHANNEL(&dptr[SDPCM_FRAMETAG_LEN]);
                         doff = SDPCM_DOFFSET_VALUE(&dptr[SDPCM_FRAMETAG_LEN]);
-#ifdef BCMDBG
-                        if (BRCMF_GLOM_ON()) {
-                                printk(KERN_DEBUG "subframe:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     dptr, 32);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                           dptr, 32, "subframe:\n");
 
                         if ((u16)~(sublen ^ check)) {
                                 brcmf_dbg(ERROR, "(subframe %d): HW hdr error: len/check 0x%04x/0x%04x\n",
@@ -1433,13 +1427,8 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                         }
                         rxseq++;
 
-#ifdef BCMDBG
-                        if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                                printk(KERN_DEBUG "Rx Subframe Data:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     dptr, dlen);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                           dptr, dlen, "Rx Subframe Data:\n");
 
                         __skb_trim(pfirst, sublen);
                         skb_pull(pfirst, doff);
@@ -1457,17 +1446,13 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                                 continue;
                         }
 
-#ifdef BCMDBG
-                        if (BRCMF_GLOM_ON()) {
-                                brcmf_dbg(GLOM, "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
-                                          bus->glom.qlen, pfirst, pfirst->data,
-                                          pfirst->len, pfirst->next,
-                                          pfirst->prev);
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                pfirst->data,
-                                                min_t(int, pfirst->len, 32));
-                        }
-#endif                          /* BCMDBG */
+                        brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                           pfirst->data,
+                                           min_t(int, pfirst->len, 32),
+                                           "subframe %d to stack, %p (%p/%d) nxt/lnk %p/%p\n",
+                                           bus->glom.qlen, pfirst, pfirst->data,
+                                           pfirst->len, pfirst->next,
+                                           pfirst->prev);
                 }
                 /* sent any remaining packets up */
                 if (bus->glom.qlen) {
@@ -1584,12 +1569,8 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
 
 gotpkt:
 
-#ifdef BCMDBG
-        if (BRCMF_BYTES_ON() && BRCMF_CTL_ON()) {
-                printk(KERN_DEBUG "RxCtrl:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, bus->rxctl, len);
-        }
-#endif
+        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_CTL_ON(),
+                           bus->rxctl, len, "RxCtrl:\n");
 
         /* Point to valid data and indicate its length */
         bus->rxctl += doff;
@@ -1818,17 +1799,13 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         }
                         bus->tx_max = txmax;
 
-#ifdef BCMDBG
-                        if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                                printk(KERN_DEBUG "Rx Data:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     rxbuf, len);
-                        } else if (BRCMF_HDRS_ON()) {
-                                printk(KERN_DEBUG "RxHdr:\n");
-                                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                                     bus->rxhdr, SDPCM_HDRLEN);
-                        }
-#endif
+                        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                           rxbuf, len, "Rx Data:\n");
+                        brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() &&
+                                             BRCMF_DATA_ON()) &&
+                                           BRCMF_HDRS_ON(),
+                                           bus->rxhdr, SDPCM_HDRLEN,
+                                           "RxHdr:\n");
 
                         if (chan == SDPCM_CONTROL_CHANNEL) {
                                 brcmf_dbg(ERROR, "(nextlen): readahead on control packet %d?\n",
@@ -1865,13 +1842,9 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                         brcmf_sdbrcm_rxfail(bus, true, true);
                         continue;
                 }
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() || BRCMF_HDRS_ON()) {
-                        printk(KERN_DEBUG "RxHdr:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             bus->rxhdr, SDPCM_HDRLEN);
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() || BRCMF_HDRS_ON(),
+                                   bus->rxhdr, SDPCM_HDRLEN, "RxHdr:\n");
+
 
                 /* Extract hardware header fields */
                 len = get_unaligned_le16(bus->rxhdr);
@@ -2024,13 +1997,8 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
                 skb_push(pkt, BRCMF_FIRSTREAD);
                 memcpy(pkt->data, bus->rxhdr, BRCMF_FIRSTREAD);
 
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() && BRCMF_DATA_ON()) {
-                        printk(KERN_DEBUG "Rx Data:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             pkt->data, len);
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_DATA_ON(),
+                                   pkt->data, len, "Rx Data:\n");
 
 deliver:
                 /* Save superframe descriptor and allocate packet frame */
@@ -2038,14 +2006,9 @@ deliver:
                         if (SDPCM_GLOMDESC(&bus->rxhdr[SDPCM_FRAMETAG_LEN])) {
                                 brcmf_dbg(GLOM, "glom descriptor, %d bytes:\n",
                                           len);
-#ifdef BCMDBG
-                                if (BRCMF_GLOM_ON()) {
-                                        printk(KERN_DEBUG "Glom Data:\n");
-                                        print_hex_dump_bytes("",
-                                                             DUMP_PREFIX_OFFSET,
-                                                             pkt->data, len);
-                                }
-#endif
+                                brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
+                                                   pkt->data, len,
+                                                   "Glom Data:\n");
                                 __skb_trim(pkt, len);
                                 skb_pull(pkt, SDPCM_HDRLEN);
                                 bus->glomd = pkt;
@@ -2078,13 +2041,11 @@ deliver:
                 down(&bus->sdsem);
         }
         rxcount = maxframes - rxleft;
-#ifdef BCMDBG
         /* Message if we hit the limit */
         if (!rxleft)
                 brcmf_dbg(DATA, "hit rx limit of %d frames\n",
                           maxframes);
         else
-#endif                          /* BCMDBG */
                 brcmf_dbg(DATA, "processed %d frames\n", rxcount);
         /* Back off rxseq if awaiting rtx, update rx_seq */
         if (bus->rxskip)
@@ -2176,20 +2137,22 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt,
         put_unaligned_le32(swheader, frame + SDPCM_FRAMETAG_LEN);
         put_unaligned_le32(0, frame + SDPCM_FRAMETAG_LEN + sizeof(swheader));
 
-#ifdef BCMDBG
+#ifdef DEBUG
         tx_packets[pkt->priority]++;
-        if (BRCMF_BYTES_ON() &&
-            (((BRCMF_CTL_ON() && (chan == SDPCM_CONTROL_CHANNEL)) ||
-              (BRCMF_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
-                printk(KERN_DEBUG "Tx Frame:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, frame, len);
-        } else if (BRCMF_HDRS_ON()) {
-                printk(KERN_DEBUG "TxHdr:\n");
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                     frame, min_t(u16, len, 16));
-        }
 #endif
 
+        brcmf_dbg_hex_dump(BRCMF_BYTES_ON() &&
+                           ((BRCMF_CTL_ON() && chan == SDPCM_CONTROL_CHANNEL) ||
+                            (BRCMF_DATA_ON() && chan != SDPCM_CONTROL_CHANNEL)),
+                           frame, len, "Tx Frame:\n");
+        brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() &&
+                             ((BRCMF_CTL_ON() &&
+                               chan == SDPCM_CONTROL_CHANNEL) ||
+                              (BRCMF_DATA_ON() &&
+                               chan != SDPCM_CONTROL_CHANNEL))) &&
+                           BRCMF_HDRS_ON(),
+                           frame, min_t(u16, len, 16), "TxHdr:\n");
+
         /* Raise len to next SDIO block to eliminate tail command */
         if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
                 u16 pad = bus->blocksize - (len % bus->blocksize);
@@ -2410,7 +2373,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                 int err;
                 u8 clkctl, devctl = 0;
 
-#ifdef BCMDBG
+#ifdef DEBUG
                 /* Check for inconsistent device control */
                 devctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
                                                SBSDIO_DEVICE_CTL, &err);
@@ -2418,7 +2381,7 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
                         brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
                         bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
                 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 /* Read CSR, if clock on switch to AVAIL, else ignore */
                 clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
@@ -2701,7 +2664,7 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
                 brcmf_txflowcontrol(bus->sdiodev->dev, 0, ON);
         }
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (pktq_plen(&bus->txq, prec) > qcount[prec])
                 qcount[prec] = pktq_plen(&bus->txq, prec);
 #endif
@@ -2774,7 +2737,7 @@ xfer_done:
         return bcmerror;
 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
 #define CONSOLE_LINE_MAX        192
 
 static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
@@ -2845,14 +2808,14 @@ static int brcmf_sdbrcm_readconsole(struct brcmf_sdio *bus)
                         if (line[n - 1] == '\r')
                                 n--;
                         line[n] = 0;
-                        printk(KERN_DEBUG "CONSOLE: %s\n", line);
+                        pr_debug("CONSOLE: %s\n", line);
                 }
         }
 break2:
 
         return 0;
 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 static int brcmf_tx_frame(struct brcmf_sdio *bus, u8 *frame, u16 len)
 {
@@ -2982,17 +2945,11 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
         }
 
         if (ret == -1) {
-#ifdef BCMDBG
-                if (BRCMF_BYTES_ON() && BRCMF_CTL_ON()) {
-                        printk(KERN_DEBUG "Tx Frame:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             frame, len);
-                } else if (BRCMF_HDRS_ON()) {
-                        printk(KERN_DEBUG "TxHdr:\n");
-                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                                             frame, min_t(u16, len, 16));
-                }
-#endif
+                brcmf_dbg_hex_dump(BRCMF_BYTES_ON() && BRCMF_CTL_ON(),
+                                   frame, len, "Tx Frame:\n");
+                brcmf_dbg_hex_dump(!(BRCMF_BYTES_ON() && BRCMF_CTL_ON()) &&
+                                   BRCMF_HDRS_ON(),
+                                   frame, min_t(u16, len, 16), "TxHdr:\n");
 
                 do {
                         ret = brcmf_tx_frame(bus, frame, len);
@@ -3096,9 +3053,9 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
         u8 *vbuffer;
         u32 varsizew;
         __le32 varsizew_le;
-#ifdef BCMDBG
+#ifdef DEBUG
         char *nvram_ularray;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* Even if there are no vars are to be written, we still
                  need to set the ramsize. */
@@ -3115,7 +3072,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                 /* Write the vars list */
                 bcmerror =
                     brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize);
-#ifdef BCMDBG
+#ifdef DEBUG
                 /* Verify NVRAM bytes */
                 brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
                 nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
@@ -3142,7 +3099,7 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                         brcmf_dbg(ERROR, "Download/Upload/Compare of NVRAM ok\n");
 
                 kfree(nvram_ularray);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 kfree(vbuffer);
         }
@@ -3569,9 +3526,9 @@ void brcmf_sdbrcm_isr(void *arg)
 
 static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
 {
-#ifdef BCMDBG
+#ifdef DEBUG
         struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);
-#endif  /* BCMDBG */
+#endif  /* DEBUG */
 
         brcmf_dbg(TIMER, "Enter\n");
 
@@ -3616,7 +3573,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                 /* Update interrupt tracking */
                 bus->lastintrs = bus->intrcount;
         }
-#ifdef BCMDBG
+#ifdef DEBUG
         /* Poll for console output periodically */
         if (bus_if->state == BRCMF_BUS_DATA &&
             bus->console_interval != 0) {
@@ -3630,7 +3587,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
                                 bus->console_interval = 0;
                 }
         }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* On idle timeout clear activity flag and/or turn off clock */
         if ((bus->idletime > 0) && (bus->clkstate == CLK_AVAIL)) {
@@ -3721,11 +3678,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)
         if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, SI_ENUM_BASE))
                 brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
 
-#ifdef BCMDBG
-        printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n",
-               brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
-
-#endif                          /* BCMDBG */
+        pr_debug("F1 signature read @0x18000000=0x%4x\n",
+                 brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
 
         /*
          * Force PLL off until brcmf_sdio_chip_attach()
@@ -3944,8 +3898,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         bus->watchdog_tsk = kthread_run(brcmf_sdbrcm_watchdog_thread,
                                         bus, "brcmf_watchdog");
         if (IS_ERR(bus->watchdog_tsk)) {
-                printk(KERN_WARNING
-                       "brcmf_watchdog thread failed to start\n");
+                pr_warn("brcmf_watchdog thread failed to start\n");
                 bus->watchdog_tsk = NULL;
         }
         /* Initialize DPC thread */
@@ -3953,8 +3906,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         bus->dpc_tsk = kthread_run(brcmf_sdbrcm_dpc_thread,
                                    bus, "brcmf_dpc");
         if (IS_ERR(bus->dpc_tsk)) {
-                printk(KERN_WARNING
-                       "brcmf_dpc thread failed to start\n");
+                pr_warn("brcmf_dpc thread failed to start\n");
                 bus->dpc_tsk = NULL;
         }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 11b2d7c97ba2..1534efc21631 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,6 +15,8 @@
  */
 /* ***** SDIO interface chip backplane handle functions ***** */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index bf11850a20f1..74c95a597950 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,6 +16,8 @@
 
 /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
 #include <linux/sched.h>
@@ -2783,7 +2785,7 @@ static struct wireless_dev *brcmf_alloc_wdev(s32 sizeof_iface,
             wiphy_new(&wl_cfg80211_ops,
                       sizeof(struct brcmf_cfg80211_priv) + sizeof_iface);
         if (!wdev->wiphy) {
-                WL_ERR("Couldn not allocate wiphy device\n");
+                WL_ERR("Could not allocate wiphy device\n");
                 err = -ENOMEM;
                 goto wiphy_new_out;
         }
@@ -2809,7 +2811,7 @@ static struct wireless_dev *brcmf_alloc_wdev(s32 sizeof_iface,
                                                                  */
         err = wiphy_register(wdev->wiphy);
         if (err < 0) {
-                WL_ERR("Couldn not register wiphy device (%d)\n", err);
+                WL_ERR("Could not register wiphy device (%d)\n", err);
                 goto wiphy_register_out;
         }
         return wdev;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index a613b49cb13f..b5d9b36df3d0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -32,63 +32,63 @@ struct brcmf_cfg80211_ibss;
 #define WL_DBG_MASK             ((WL_DBG_INFO | WL_DBG_ERR | WL_DBG_TRACE) | \
                                 (WL_DBG_SCAN) | (WL_DBG_CONN))
 
-#define WL_ERR(fmt, args...)                                    \
+#define WL_ERR(fmt, ...)                                        \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_ERR) {                     \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "ERROR @%s : " fmt,     \
-                                __func__, ##args);              \
+                        pr_err("ERROR @%s : " fmt,              \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#if (defined BCMDBG)
-#define WL_INFO(fmt, args...)                                   \
+#if (defined DEBUG)
+#define WL_INFO(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_INFO) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "INFO @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("INFO @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_TRACE(fmt, args...)                                  \
+#define WL_TRACE(fmt, ...)                                      \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_TRACE) {                   \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "TRACE @%s : " fmt,     \
-                                __func__, ##args);              \
+                        pr_err("TRACE @%s : " fmt,              \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_SCAN(fmt, args...)                                   \
+#define WL_SCAN(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_SCAN) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "SCAN @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("SCAN @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#define WL_CONN(fmt, args...)                                   \
+#define WL_CONN(fmt, ...)                                       \
 do {                                                            \
         if (brcmf_dbg_level & WL_DBG_CONN) {                    \
                 if (net_ratelimit()) {                          \
-                        printk(KERN_ERR "CONN @%s : " fmt,      \
-                                __func__, ##args);              \
+                        pr_err("CONN @%s : " fmt,               \
+                               __func__, ##__VA_ARGS__);        \
                 }                                               \
         }                                                       \
 } while (0)
 
-#else /* (defined BCMDBG) */
+#else /* (defined DEBUG) */
 #define WL_INFO(fmt, args...)
 #define WL_TRACE(fmt, args...)
 #define WL_SCAN(fmt, args...)
 #define WL_CONN(fmt, args...)
-#endif /* (defined BCMDBG) */
+#endif /* (defined DEBUG) */
 
 #define WL_NUM_SCAN_MAX         1
 #define WL_NUM_PMKIDS_MAX       MAXPMKID        /* will be used
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index ab9bb11abfbb..c93ea35bceec 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -326,11 +326,11 @@
 
 #define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
 
-#ifdef BCMDBG
+#ifdef DEBUG
 #define SI_MSG(fmt, ...)        pr_debug(fmt, ##__VA_ARGS__)
 #else
 #define SI_MSG(fmt, ...)        no_printk(fmt, ##__VA_ARGS__)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define GOODCOREADDR(x, b) \
         (((x) >= (b)) && ((x) < ((b) + SI_MAXCORES * SI_CORE_SIZE)) && \
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 90911eec0cf5..d89dcb14cb6d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -915,7 +915,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(p);
         struct wiphy *wiphy = wlc->wiphy;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         u8 hole[AMPDU_MAX_MPDU];
         memset(hole, 0, sizeof(hole));
 #endif
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 2e90a9a16ed6..11054ae9d4f6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -177,7 +177,7 @@
 #define BCMEXTRAHDROOM 172
 
 /* debug/trace */
-#ifdef BCMDBG
+#ifdef DEBUG
 #define DMA_ERROR(fmt, ...)                                     \
 do {                                                            \
         if (*di->msg_level & 1)                                 \
@@ -193,7 +193,7 @@ do {								\
         no_printk(fmt, ##__VA_ARGS__)
 #define DMA_TRACE(fmt, ...)                     \
         no_printk(fmt, ##__VA_ARGS__)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 #define DMA_NONE(fmt, ...)                      \
         no_printk(fmt, ##__VA_ARGS__)
@@ -968,7 +968,7 @@ int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)
                         pktcnt++;
                 }
 
-#ifdef BCMDBG
+#ifdef DEBUG
                 if (resid > 0) {
                         uint cur;
                         cur =
@@ -979,7 +979,7 @@ int dma_rx(struct dma_pub *pub, struct sk_buff_head *skb_list)
                         DMA_ERROR("rxin %d rxout %d, hw_curr %d\n",
                                    di->rxin, di->rxout, cur);
                 }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
                 if ((di->dma.dmactrlflags & DMA_CTRL_RXMULTI) == 0) {
                         DMA_ERROR("%s: bad frame length (%d)\n",
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 448ab9c4eb47..c8427978d09e 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -15,6 +15,7 @@
  */
 
 #define __UNDEF_NO_VERSION__
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/etherdevice.h>
 #include <linux/sched.h>
@@ -96,10 +97,10 @@ static struct bcma_device_id brcms_coreid_table[] = {
 };
 MODULE_DEVICE_TABLE(bcma, brcms_coreid_table);
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static int msglevel = 0xdeadbeef;
 module_param(msglevel, int, 0);
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 static struct ieee80211_channel brcms_2ghz_chantable[] = {
         CHAN2GHZ(1, 2412, IEEE80211_CHAN_NO_HT40MINUS),
@@ -857,7 +858,7 @@ static void brcms_free(struct brcms_info *wl)
         /* free timers */
         for (t = wl->timers; t; t = next) {
                 next = t->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                 kfree(t->name);
 #endif
                 kfree(t);
@@ -1121,8 +1122,7 @@ static int __devinit brcms_bcma_probe(struct bcma_device *pdev)
 
         wl = brcms_attach(pdev);
         if (!wl) {
-                pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,
-                       __func__);
+                pr_err("%s: brcms_attach failed!\n", __func__);
                 return -ENODEV;
         }
         return 0;
@@ -1177,13 +1177,13 @@ static int __init brcms_module_init(void)
 {
         int error = -ENODEV;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (msglevel != 0xdeadbeef)
                 brcm_msg_level = msglevel;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         error = bcma_driver_register(&brcms_bcma_driver);
-        printk(KERN_ERR "%s: register returned %d\n", __func__, error);
+        pr_err("%s: register returned %d\n", __func__, error);
         if (!error)
                 return 0;
 
@@ -1367,7 +1367,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
         t->next = wl->timers;
         wl->timers = t;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         t->name = kmalloc(strlen(name) + 1, GFP_ATOMIC);
         if (t->name)
                 strcpy(t->name, name);
@@ -1386,7 +1386,7 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
 {
         struct ieee80211_hw *hw = t->wl->pub->ieee_hw;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         if (t->set)
                 wiphy_err(hw->wiphy, "%s: Already set. Name: %s, per %d\n",
                           __func__, t->name, periodic);
@@ -1431,7 +1431,7 @@ void brcms_free_timer(struct brcms_timer *t)
 
         if (wl->timers == t) {
                 wl->timers = wl->timers->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                 kfree(t->name);
 #endif
                 kfree(t);
@@ -1443,7 +1443,7 @@ void brcms_free_timer(struct brcms_timer *t)
         while (tmp) {
                 if (tmp->next == t) {
                         tmp->next = t->next;
-#ifdef BCMDBG
+#ifdef DEBUG
                         kfree(t->name);
 #endif
                         kfree(t);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
index 8f60419c37bf..9358bd5ebd35 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
@@ -40,7 +40,7 @@ struct brcms_timer {
         bool periodic;
         bool set;               /* indicates if timer is active */
         struct brcms_timer *next;       /* for freeing on unload */
-#ifdef BCMDBG
+#ifdef DEBUG
         char *name;             /* Description of the timer */
 #endif
 };
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index f6affc6fd12a..fb712cac9157 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci_ids.h>
 #include <linux/if_ether.h>
 #include <net/mac80211.h>
@@ -293,11 +295,11 @@ const u8 prio2fifo[NUMPRIO] = {
 
 /* debug/trace */
 uint brcm_msg_level =
-#if defined(BCMDBG)
+#if defined(DEBUG)
         LOG_ERROR_VAL;
 #else
         0;
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
 /* TX FIFO number to WME/802.1E Access Category */
 static const u8 wme_fifo2ac[] = {
@@ -342,14 +344,14 @@ static const u16 xmtfifo_sz[][NFIFO] = {
         {9, 58, 22, 14, 14, 5},
 };
 
-#ifdef BCMDBG
+#ifdef DEBUG
 static const char * const fifo_names[] = {
         "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
 #else
 static const char fifo_names[6][0];
 #endif
 
-#ifdef BCMDBG
+#ifdef DEBUG
 /* pointer to most recently allocated wl/wlc */
 static struct brcms_c_info *wlc_info_dbg = (struct brcms_c_info *) (NULL);
 #endif
@@ -3075,30 +3077,30 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
 {
         int i;
         struct macstat macstats;
-#ifdef BCMDBG
+#ifdef DEBUG
         u16 delta;
         u16 rxf0ovfl;
         u16 txfunfl[NFIFO];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* if driver down, make no sense to update stats */
         if (!wlc->pub->up)
                 return;
 
-#ifdef BCMDBG
+#ifdef DEBUG
         /* save last rx fifo 0 overflow count */
         rxf0ovfl = wlc->core->macstat_snapshot->rxf0ovfl;
 
         /* save last tx fifo  underflow count */
         for (i = 0; i < NFIFO; i++)
                 txfunfl[i] = wlc->core->macstat_snapshot->txfunfl[i];
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* Read mac stats from contiguous shared memory */
         brcms_b_copyfrom_objmem(wlc->hw, M_UCODE_MACSTAT, &macstats,
                                 sizeof(struct macstat), OBJADDR_SHM_SEL);
 
-#ifdef BCMDBG
+#ifdef DEBUG
         /* check for rx fifo 0 overflow */
         delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
         if (delta)
@@ -3114,7 +3116,7 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
                         wiphy_err(wlc->wiphy, "wl%d: %u tx fifo %d underflows!"
                                   "\n", wlc->pub->unit, delta, i);
         }
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
 
         /* merge counters from dma module */
         for (i = 0; i < NFIFO; i++) {
@@ -5765,62 +5767,49 @@ int brcms_c_module_unregister(struct brcms_pub *pub, const char *name,
         return -ENODATA;
 }
 
-#ifdef BCMDBG
-static const char * const supr_reason[] = {
-        "None", "PMQ Entry", "Flush request",
-        "Previous frag failure", "Channel mismatch",
-        "Lifetime Expiry", "Underflow"
-};
-
-static void brcms_c_print_txs_status(u16 s)
-{
-        printk(KERN_DEBUG "[15:12]  %d  frame attempts\n",
-               (s & TX_STATUS_FRM_RTX_MASK) >> TX_STATUS_FRM_RTX_SHIFT);
-        printk(KERN_DEBUG " [11:8]  %d  rts attempts\n",
-               (s & TX_STATUS_RTS_RTX_MASK) >> TX_STATUS_RTS_RTX_SHIFT);
-        printk(KERN_DEBUG "    [7]  %d  PM mode indicated\n",
-               ((s & TX_STATUS_PMINDCTD) ? 1 : 0));
-        printk(KERN_DEBUG "    [6]  %d  intermediate status\n",
-               ((s & TX_STATUS_INTERMEDIATE) ? 1 : 0));
-        printk(KERN_DEBUG "    [5]  %d  AMPDU\n",
-               (s & TX_STATUS_AMPDU) ? 1 : 0);
-        printk(KERN_DEBUG "  [4:2]  %d  Frame Suppressed Reason (%s)\n",
-               ((s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT),
-               supr_reason[(s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT]);
-        printk(KERN_DEBUG "    [1]  %d  acked\n",
-               ((s & TX_STATUS_ACK_RCV) ? 1 : 0));
-}
-#endif                          /* BCMDBG */
-
 void brcms_c_print_txstatus(struct tx_status *txs)
 {
-#if defined(BCMDBG)
-        u16 s = txs->status;
-        u16 ackphyrxsh = txs->ackphyrxsh;
-
-        printk(KERN_DEBUG "\ntxpkt (MPDU) Complete\n");
-
-        printk(KERN_DEBUG "FrameID: %04x   ", txs->frameid);
-        printk(KERN_DEBUG "TxStatus: %04x", s);
-        printk(KERN_DEBUG "\n");
-
-        brcms_c_print_txs_status(s);
-
-        printk(KERN_DEBUG "LastTxTime: %04x ", txs->lasttxtime);
-        printk(KERN_DEBUG "Seq: %04x ", txs->sequence);
-        printk(KERN_DEBUG "PHYTxStatus: %04x ", txs->phyerr);
-        printk(KERN_DEBUG "RxAckRSSI: %04x ",
-               (ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT);
-        printk(KERN_DEBUG "RxAckSQ: %04x",
-               (ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
-        printk(KERN_DEBUG "\n");
-#endif                          /* defined(BCMDBG) */
+        pr_debug("\ntxpkt (MPDU) Complete\n");
+
+        pr_debug("FrameID: %04x   TxStatus: %04x\n", txs->frameid, txs->status);
+
+        pr_debug("[15:12]  %d  frame attempts\n",
+                  (txs->status & TX_STATUS_FRM_RTX_MASK) >>
+                 TX_STATUS_FRM_RTX_SHIFT);
+        pr_debug(" [11:8]  %d  rts attempts\n",
+                 (txs->status & TX_STATUS_RTS_RTX_MASK) >>
+                 TX_STATUS_RTS_RTX_SHIFT);
+        pr_debug("    [7]  %d  PM mode indicated\n",
+                 txs->status & TX_STATUS_PMINDCTD ? 1 : 0);
+        pr_debug("    [6]  %d  intermediate status\n",
+                 txs->status & TX_STATUS_INTERMEDIATE ? 1 : 0);
+        pr_debug("    [5]  %d  AMPDU\n",
+                 txs->status & TX_STATUS_AMPDU ? 1 : 0);
+        pr_debug("  [4:2]  %d  Frame Suppressed Reason (%s)\n",
+                 (txs->status & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT,
+                 (const char *[]) {
+                        "None",
+                        "PMQ Entry",
+                        "Flush request",
+                        "Previous frag failure",
+                        "Channel mismatch",
+                        "Lifetime Expiry",
+                        "Underflow"
+                 } [(txs->status & TX_STATUS_SUPR_MASK) >>
+                    TX_STATUS_SUPR_SHIFT]);
+        pr_debug("    [1]  %d  acked\n",
+                 txs->status & TX_STATUS_ACK_RCV ? 1 : 0);
+
+        pr_debug("LastTxTime: %04x Seq: %04x PHYTxStatus: %04x RxAckRSSI: %04x RxAckSQ: %04x\n",
+                 txs->lasttxtime, txs->sequence, txs->phyerr,
+                 (txs->ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT,
+                 (txs->ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
 }
 
 bool brcms_c_chipmatch(u16 vendor, u16 device)
 {
         if (vendor != PCI_VENDOR_ID_BROADCOM) {
-                pr_err("chipmatch: unknown vendor id %04x\n", vendor);
+                pr_err("unknown vendor id %04x\n", vendor);
                 return false;
         }
 
@@ -5833,11 +5822,11 @@ bool brcms_c_chipmatch(u16 vendor, u16 device)
         if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID))
                 return true;
 
-        pr_err("chipmatch: unknown device id %04x\n", device);
+        pr_err("unknown device id %04x\n", device);
         return false;
 }
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 void brcms_c_print_txdesc(struct d11txh *txh)
 {
         u16 mtcl = le16_to_cpu(txh->MacTxControlLow);
@@ -5871,57 +5860,56 @@ void brcms_c_print_txdesc(struct d11txh *txh)
         struct ieee80211_rts rts = txh->rts_frame;
 
         /* add plcp header along with txh descriptor */
-        printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");
-        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
-                             txh, sizeof(struct d11txh) + 48);
-
-        printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl);
-        printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch);
-        printk(KERN_DEBUG "FC: %04x ", mfc);
-        printk(KERN_DEBUG "FES Time: %04x\n", tfest);
-        printk(KERN_DEBUG "PhyCtl: %04x%s ", ptcw,
+        brcmu_dbg_hex_dump(txh, sizeof(struct d11txh) + 48,
+                           "Raw TxDesc + plcp header:\n");
+
+        pr_debug("TxCtlLow: %04x ", mtcl);
+        pr_debug("TxCtlHigh: %04x ", mtch);
+        pr_debug("FC: %04x ", mfc);
+        pr_debug("FES Time: %04x\n", tfest);
+        pr_debug("PhyCtl: %04x%s ", ptcw,
                (ptcw & PHY_TXC_SHORT_HDR) ? " short" : "");
-        printk(KERN_DEBUG "PhyCtl_1: %04x ", ptcw_1);
-        printk(KERN_DEBUG "PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
-        printk(KERN_DEBUG "PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
-        printk(KERN_DEBUG "PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
-        printk(KERN_DEBUG "MainRates: %04x ", mainrates);
-        printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);
-        printk(KERN_DEBUG "\n");
+        pr_debug("PhyCtl_1: %04x ", ptcw_1);
+        pr_debug("PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
+        pr_debug("PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
+        pr_debug("PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
+        pr_debug("MainRates: %04x ", mainrates);
+        pr_debug("XtraFrameTypes: %04x ", xtraft);
+        pr_debug("\n");
 
         print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh->IV));
         print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET,
                              ra, sizeof(txh->TxFrameRA));
 
-        printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);
+        pr_debug("Fb FES Time: %04x ", tfestfb);
         print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET,
                              rtspfb, sizeof(txh->RTSPLCPFallback));
-        printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);
+        pr_debug("RTS DUR: %04x ", rtsdfb);
         print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET,
                              fragpfb, sizeof(txh->FragPLCPFallback));
-        printk(KERN_DEBUG "DUR: %04x", fragdfb);
-        printk(KERN_DEBUG "\n");
+        pr_debug("DUR: %04x", fragdfb);
+        pr_debug("\n");
 
-        printk(KERN_DEBUG "MModeLen: %04x ", mmodelen);
-        printk(KERN_DEBUG "MModeFbrLen: %04x\n", mmodefbrlen);
+        pr_debug("MModeLen: %04x ", mmodelen);
+        pr_debug("MModeFbrLen: %04x\n", mmodefbrlen);
 
-        printk(KERN_DEBUG "FrameID:     %04x\n", tfid);
-        printk(KERN_DEBUG "TxStatus:    %04x\n", txs);
+        pr_debug("FrameID:     %04x\n", tfid);
+        pr_debug("TxStatus:    %04x\n", txs);
 
-        printk(KERN_DEBUG "MaxNumMpdu:  %04x\n", mnmpdu);
-        printk(KERN_DEBUG "MaxAggbyte:  %04x\n", mabyte);
-        printk(KERN_DEBUG "MaxAggbyte_fb:  %04x\n", mabyte_f);
-        printk(KERN_DEBUG "MinByte:     %04x\n", mmbyte);
+        pr_debug("MaxNumMpdu:  %04x\n", mnmpdu);
+        pr_debug("MaxAggbyte:  %04x\n", mabyte);
+        pr_debug("MaxAggbyte_fb:  %04x\n", mabyte_f);
+        pr_debug("MinByte:     %04x\n", mmbyte);
 
         print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET,
                              rtsph, sizeof(txh->RTSPhyHeader));
         print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET,
                              (u8 *)&rts, sizeof(txh->rts_frame));
-        printk(KERN_DEBUG "\n");
+        pr_debug("\n");
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 static int
 brcms_c_format_flags(const struct brcms_c_bit_desc *bd, u32 flags, char *buf,
                      int len)
@@ -5975,9 +5963,9 @@ brcms_c_format_flags(const struct brcms_c_bit_desc *bd, u32 flags, char *buf,
 
         return (int)(p - buf);
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 void brcms_c_print_rxh(struct d11rxhdr *rxh)
 {
         u16 len = rxh->RxFrameSize;
@@ -5999,24 +5987,22 @@ void brcms_c_print_rxh(struct d11rxhdr *rxh)
                 {0, NULL}
         };
 
-        printk(KERN_DEBUG "Raw RxDesc:\n");
-        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh,
-                             sizeof(struct d11rxhdr));
+        brcmu_dbg_hex_dump(rxh, sizeof(struct d11rxhdr), "Raw RxDesc:\n");
 
         brcms_c_format_flags(macstat_flags, macstatus1, flagstr, 64);
 
         snprintf(lenbuf, sizeof(lenbuf), "0x%x", len);
 
-        printk(KERN_DEBUG "RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
+        pr_debug("RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
                (rxh->PhyRxStatus_0 & PRXS0_SHORTH) ? " short preamble" : "");
-        printk(KERN_DEBUG "RxPHYStatus:     %04x %04x %04x %04x\n",
+        pr_debug("RxPHYStatus:     %04x %04x %04x %04x\n",
                phystatus_0, phystatus_1, phystatus_2, phystatus_3);
-        printk(KERN_DEBUG "RxMACStatus:     %x %s\n", macstatus1, flagstr);
-        printk(KERN_DEBUG "RXMACaggtype:    %x\n",
+        pr_debug("RxMACStatus:     %x %s\n", macstatus1, flagstr);
+        pr_debug("RXMACaggtype:    %x\n",
                (macstatus2 & RXS_AGGTYPE_MASK));
-        printk(KERN_DEBUG "RxTSFTime:       %04x\n", rxh->RxTSFTime);
+        pr_debug("RxTSFTime:       %04x\n", rxh->RxTSFTime);
 }
-#endif                          /* defined(BCMDBG) */
+#endif                          /* defined(DEBUG) */
 
 u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate)
 {
@@ -8354,7 +8340,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
         wlc->wiphy = wl->wiphy;
         pub = wlc->pub;
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
         wlc_info_dbg = wlc;
 #endif
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/brcm80211/brcmsmac/main.h
index adb136ec1f04..8debc74c54e1 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h
@@ -648,10 +648,12 @@ extern void brcms_c_print_txstatus(struct tx_status *txs);
 extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
                    uint *blocks);
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 extern void brcms_c_print_txdesc(struct d11txh *txh);
 #else
-#define brcms_c_print_txdesc(a)
+static inline void brcms_c_print_txdesc(struct d11txh *txh)
+{
+}
 #endif
 
 extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index a16f1ab292fd..ec7450d2fbd6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/cordic.h>
@@ -26434,8 +26436,7 @@ cal_try:
         }
 
         if (bcmerror != 0) {
-                printk(KERN_DEBUG "%s: Failed, cnt = %d\n", __func__,
-                       cal_retry);
+                pr_debug("%s: Failed, cnt = %d\n", __func__, cal_retry);
 
                 if (cal_retry < CAL_RETRY_CNT) {
                         cal_retry++;
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index b7537f70a795..b45ab34cdfdc 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -14,6 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/netdevice.h>
 #include <linux/module.h>
 
@@ -240,17 +242,35 @@ struct sk_buff *brcmu_pktq_mdeq(struct pktq *pq, uint prec_bmp,
 }
 EXPORT_SYMBOL(brcmu_pktq_mdeq);
 
-#if defined(BCMDBG)
+#if defined(DEBUG)
 /* pretty hex print a pkt buffer chain */
 void brcmu_prpkt(const char *msg, struct sk_buff *p0)
 {
         struct sk_buff *p;
 
         if (msg && (msg[0] != '\0'))
-                printk(KERN_DEBUG "%s:\n", msg);
+                pr_debug("%s:\n", msg);
 
         for (p = p0; p; p = p->next)
                 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, p->data, p->len);
 }
 EXPORT_SYMBOL(brcmu_prpkt);
-#endif                          /* defined(BCMDBG) */
+
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        pr_debug("%pV", &vaf);
+
+        va_end(args);
+
+        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, data, size);
+}
+EXPORT_SYMBOL(brcmu_dbg_hex_dump);
+#endif                          /* defined(DEBUG) */
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
index ad249a0b4730..477b92ad3d62 100644
--- a/drivers/net/wireless/brcm80211/include/brcmu_utils.h
+++ b/drivers/net/wireless/brcm80211/include/brcmu_utils.h
@@ -176,10 +176,21 @@ struct ipv4_addr;
 
 /* externs */
 /* format/print */
-#ifdef BCMDBG
+#ifdef DEBUG
 extern void brcmu_prpkt(const char *msg, struct sk_buff *p0);
 #else
 #define brcmu_prpkt(a, b)
-#endif                          /* BCMDBG */
+#endif                          /* DEBUG */
+
+#ifdef DEBUG
+extern __printf(3, 4)
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...);
+#else
+__printf(3, 4)
+static inline
+void brcmu_dbg_hex_dump(const void *data, size_t size, const char *fmt, ...)
+{
+}
+#endif
 
 #endif                          /* _BRCMU_UTILS_H_ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 1ef7bfc2ab25..cc04cce11567 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 094693328dbb..00db092d8cd0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index b3a365fea7bb..47fd98b3652c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 54b753399e6e..ab62c018fcdb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 50ff849c9f67..6aa009827865 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
index 10275ce92bde..9ed6683314a7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
index 123ef5e129d5..d0ec0abd3c89 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hw.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 64cf439035c3..a8f7689aaacf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 334b5ae8fdd4..b9ba404d15c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
index 6675b3c816d9..203b1c13c491 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index b22b2976f899..f127f913e5a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portionhelp of the ieee80211 subsystem header files.
@@ -1172,20 +1172,22 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                 wake_up_all(&priv->shrd->notif_waitq);
         }
 
-        if (priv->pre_rx_handler)
+        if (priv->pre_rx_handler &&
+            priv->shrd->ucode_owner == IWL_OWNERSHIP_TM)
                 priv->pre_rx_handler(priv, rxb);
-
-        /* Based on type of command response or notification,
-         *   handle those that need handling via function in
-         *   rx_handlers table.  See iwl_setup_rx_handlers() */
-        if (priv->rx_handlers[pkt->hdr.cmd]) {
-                priv->rx_handlers_stats[pkt->hdr.cmd]++;
-                err = priv->rx_handlers[pkt->hdr.cmd] (priv, rxb, cmd);
-        } else {
-                /* No handling needed */
-                IWL_DEBUG_RX(priv,
-                        "No handler needed for %s, 0x%02x\n",
-                        get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+        else {
+                /* Based on type of command response or notification,
+                 *   handle those that need handling via function in
+                 *   rx_handlers table.  See iwl_setup_rx_handlers() */
+                if (priv->rx_handlers[pkt->hdr.cmd]) {
+                        priv->rx_handlers_stats[pkt->hdr.cmd]++;
+                        err = priv->rx_handlers[pkt->hdr.cmd] (priv, rxb, cmd);
+                } else {
+                        /* No handling needed */
+                        IWL_DEBUG_RX(priv,
+                                "No handler needed for %s, 0x%02x\n",
+                                get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);
+                }
         }
         return err;
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 1c6659416621..8ca9570ec365 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
index 7353826095f1..d6aab00272b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -35,9 +35,12 @@
 #include "iwl-trans.h"
 
 /* priv->shrd->sta_lock must be held */
-static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
+static int iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
-
+        if (sta_id >= IWLAGN_STATION_COUNT) {
+                IWL_ERR(priv, "invalid sta_id %u", sta_id);
+                return -EINVAL;
+        }
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE))
                 IWL_ERR(priv, "ACTIVATE a non DRIVER active station id %u "
                         "addr %pM\n",
@@ -53,6 +56,7 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
                 IWL_DEBUG_ASSOC(priv, "Added STA id %u addr %pM to uCode\n",
                                 sta_id, priv->stations[sta_id].sta.sta.addr);
         }
+        return 0;
 }
 
 static int iwl_process_add_sta_resp(struct iwl_priv *priv,
@@ -77,8 +81,7 @@ static int iwl_process_add_sta_resp(struct iwl_priv *priv,
         switch (pkt->u.add_sta.status) {
         case ADD_STA_SUCCESS_MSK:
                 IWL_DEBUG_INFO(priv, "REPLY_ADD_STA PASSED\n");
-                iwl_sta_ucode_activate(priv, sta_id);
-                ret = 0;
+                ret = iwl_sta_ucode_activate(priv, sta_id);
                 break;
         case ADD_STA_NO_ROOM_IN_TABLE:
                 IWL_ERR(priv, "Adding station %d failed, no room in table.\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
index b0dff7a753a5..56c6def015a4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h b/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
index 7282a23e8f1c..86bbf47501c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 63bbc60be28e..64f8db685dc5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b5c7c5f0a753..90315c69cdf6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -315,7 +315,7 @@ static void iwl_bg_statistics_periodic(unsigned long data)
 
 static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                                         u32 start_idx, u32 num_events,
-                                        u32 mode)
+                                        u32 capacity, u32 mode)
 {
         u32 i;
         u32 ptr;        /* SRAM byte address of log data */
@@ -339,6 +339,15 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
         rmb();
 
         /*
+         * Refuse to read more than would have fit into the log from
+         * the current start_idx. This used to happen due to the race
+         * described below, but now WARN because the code below should
+         * prevent it from happening here.
+         */
+        if (WARN_ON(num_events > capacity - start_idx))
+                num_events = capacity - start_idx;
+
+        /*
          * "time" is actually "data" for mode 0 (no timestamp).
          * place event id # at far right for easier visual parsing.
          */
@@ -346,12 +355,11 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                 ev = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
                 time = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
                 if (mode == 0) {
-                        trace_iwlwifi_dev_ucode_cont_event(priv,
-                                                        0, time, ev);
+                        trace_iwlwifi_dev_ucode_cont_event(priv, 0, time, ev);
                 } else {
                         data = iwl_read32(bus(priv), HBUS_TARG_MEM_RDAT);
-                        trace_iwlwifi_dev_ucode_cont_event(priv,
-                                                time, data, ev);
+                        trace_iwlwifi_dev_ucode_cont_event(priv, time,
+                                                           data, ev);
                 }
         }
         /* Allow device to power down */
@@ -362,53 +370,83 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
 static void iwl_continuous_event_trace(struct iwl_priv *priv)
 {
         u32 capacity;   /* event log capacity in # entries */
+        struct {
+                u32 capacity;
+                u32 mode;
+                u32 wrap_counter;
+                u32 write_counter;
+        } __packed read;
         u32 base;       /* SRAM byte address of event log header */
         u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
         u32 num_wraps;  /* # times uCode wrapped to top of log */
         u32 next_entry; /* index of next entry to be written by uCode */
 
-        base = priv->shrd->device_pointers.error_event_table;
+        base = priv->shrd->device_pointers.log_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                capacity = iwl_read_targ_mem(bus(priv), base);
-                num_wraps = iwl_read_targ_mem(bus(priv),
-                                                base + (2 * sizeof(u32)));
-                mode = iwl_read_targ_mem(bus(priv), base + (1 * sizeof(u32)));
-                next_entry = iwl_read_targ_mem(bus(priv),
-                                                base + (3 * sizeof(u32)));
+                iwl_read_targ_mem_words(bus(priv), base, &read, sizeof(read));
+
+                capacity = read.capacity;
+                mode = read.mode;
+                num_wraps = read.wrap_counter;
+                next_entry = read.write_counter;
         } else
                 return;
 
+        /*
+         * Unfortunately, the uCode doesn't use temporary variables.
+         * Therefore, it can happen that we read next_entry == capacity,
+         * which really means next_entry == 0.
+         */
+        if (unlikely(next_entry == capacity))
+                next_entry = 0;
+        /*
+         * Additionally, the uCode increases the write pointer before
+         * the wraps counter, so if the write pointer is smaller than
+         * the old write pointer (wrap occurred) but we read that no
+         * wrap occurred, we actually read between the next_entry and
+         * num_wraps update (this does happen in practice!!) -- take
+         * that into account by increasing num_wraps.
+         */
+        if (unlikely(next_entry < priv->event_log.next_entry &&
+                     num_wraps == priv->event_log.num_wraps))
+                num_wraps++;
+
         if (num_wraps == priv->event_log.num_wraps) {
-                iwl_print_cont_event_trace(priv,
-                                       base, priv->event_log.next_entry,
-                                       next_entry - priv->event_log.next_entry,
-                                       mode);
+                iwl_print_cont_event_trace(
+                        priv, base, priv->event_log.next_entry,
+                        next_entry - priv->event_log.next_entry,
+                        capacity, mode);
+
                 priv->event_log.non_wraps_count++;
         } else {
-                if ((num_wraps - priv->event_log.num_wraps) > 1)
+                if (num_wraps - priv->event_log.num_wraps > 1)
                         priv->event_log.wraps_more_count++;
                 else
                         priv->event_log.wraps_once_count++;
+
                 trace_iwlwifi_dev_ucode_wrap_event(priv,
                                 num_wraps - priv->event_log.num_wraps,
                                 next_entry, priv->event_log.next_entry);
+
                 if (next_entry < priv->event_log.next_entry) {
-                        iwl_print_cont_event_trace(priv, base,
-                               priv->event_log.next_entry,
-                               capacity - priv->event_log.next_entry,
-                               mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, priv->event_log.next_entry,
+                                capacity - priv->event_log.next_entry,
+                                capacity, mode);
 
-                        iwl_print_cont_event_trace(priv, base, 0,
-                                next_entry, mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, 0, next_entry, capacity, mode);
                 } else {
-                        iwl_print_cont_event_trace(priv, base,
-                               next_entry, capacity - next_entry,
-                               mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, next_entry,
+                                capacity - next_entry,
+                                capacity, mode);
 
-                        iwl_print_cont_event_trace(priv, base, 0,
-                                next_entry, mode);
+                        iwl_print_cont_event_trace(
+                                priv, base, 0, next_entry, capacity, mode);
                 }
         }
+
         priv->event_log.num_wraps = num_wraps;
         priv->event_log.next_entry = next_entry;
 }
@@ -1219,6 +1257,11 @@ int iwl_alive_start(struct iwl_priv *priv)
         if (iwl_is_rfkill(priv->shrd))
                 return -ERFKILL;
 
+        if (priv->event_log.ucode_trace) {
+                /* start collecting data now */
+                mod_timer(&priv->ucode_trace, jiffies);
+        }
+
         /* download priority table before any calibration request */
         if (cfg(priv)->bt_params &&
             cfg(priv)->bt_params->advanced_bt_coexist) {
@@ -2054,7 +2097,7 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)");
 
 module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO);
 MODULE_PARM_DESC(led_mode, "0=system default, "
-                "1=On(RF On)/Off(RF Off), 2=blinking (default: 0)");
+                "1=On(RF On)/Off(RF Off), 2=blinking, 3=Off (default: 0)");
 
 module_param_named(power_save, iwlagn_mod_params.power_save,
                 bool, S_IRUGO);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index f84fb3c53563..39cbe1a1577c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-bus.h b/drivers/net/wireless/iwlwifi/iwl-bus.h
index 940d5038b39c..941b9cb23442 100644
--- a/drivers/net/wireless/iwlwifi/iwl-bus.h
+++ b/drivers/net/wireless/iwlwifi/iwl-bus.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/iwl-cfg.h
index e1d78257e4a9..957bc00cdaf0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-cfg.h
+++ b/drivers/net/wireless/iwlwifi/iwl-cfg.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index f822ac447c3b..c20618d92268 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 7bcfa781e0b9..7d6eef96454a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 7bf76ab94dd2..63f29111da13 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index fbc3095c7b44..5f96ce105f08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index f8fc2393dd4c..6f7612781e03 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 04a3343f4610..978a1d4c6a0a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -2131,9 +2131,10 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
 
         if (trace) {
                 priv->event_log.ucode_trace = true;
-                /* schedule the ucode timer to occur in UCODE_TRACE_PERIOD */
-                mod_timer(&priv->ucode_trace,
-                        jiffies + msecs_to_jiffies(UCODE_TRACE_PERIOD));
+                if (iwl_is_alive(priv->shrd)) {
+                        /* start collecting data now */
+                        mod_timer(&priv->ucode_trace, jiffies);
+                }
         } else {
                 priv->event_log.ucode_trace = false;
                 del_timer_sync(&priv->ucode_trace);
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index e54a4d11e584..af846002150a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -661,7 +661,7 @@ struct traffic_stats {
  * schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
  * to perform continuous uCode event logging operation if enabled
  */
-#define UCODE_TRACE_PERIOD (100)
+#define UCODE_TRACE_PERIOD (10)
 
 /*
  * iwl_event_log: current uCode event log position
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 2a2c8de64a04..91f45e71e0a2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 9b212a8f30bb..4d892211ce4c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2009 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index c1eda9724f42..e27d9f55267b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 9fa937ec35e3..13f2d3928ef8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 5bede9d7f955..90208094b8eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index d57ea6484bbe..83fdff381150 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index aae2eeb331a8..427d065435c8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project.
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 14dcbfcdc0fd..8761438f1532 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -177,6 +177,10 @@ void iwl_leds_init(struct iwl_priv *priv)
         int mode = iwlagn_mod_params.led_mode;
         int ret;
 
+        if (mode == IWL_LED_DISABLE) {
+                IWL_INFO(priv, "Led disabled\n");
+                return;
+        }
         if (mode == IWL_LED_DEFAULT)
                 mode = cfg(priv)->led_mode;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h
index 2550b3c7dcbf..b02a853103d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/drivers/net/wireless/iwlwifi/iwl-led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index f980e574e1f9..965d0475affd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index fb30ea7ca96b..03702a2e913a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 2b188a6025b3..c7394ef2e490 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h
index 5f7b720cf1a4..07a19fce5fdc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/iwl-power.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index bebdd828f324..a4d11016c3b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index a6454726737e..7f2e3a1c80ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -414,10 +414,25 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
         for_each_context(priv, ctx) {
                 u16 value;
 
-                if (!iwl_is_associated_ctx(ctx))
-                        continue;
-                if (ctx->staging.dev_type == RXON_DEV_TYPE_P2P)
+                switch (ctx->staging.dev_type) {
+                case RXON_DEV_TYPE_P2P:
+                        /* no timing constraints */
                         continue;
+                case RXON_DEV_TYPE_ESS:
+                default:
+                        /* timing constraints if associated */
+                        if (!iwl_is_associated_ctx(ctx))
+                                continue;
+                        break;
+                case RXON_DEV_TYPE_CP:
+                case RXON_DEV_TYPE_2STA:
+                        /*
+                         * These seem to always have timers for TBTT
+                         * active in uCode even when not associated yet.
+                         */
+                        break;
+                }
+
                 value = ctx->beacon_int;
                 if (!value)
                         value = IWL_PASSIVE_DWELL_BASE;
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index dc55cc4a8108..04975b7b65b3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ struct iwl_trans_ops;
 
 #define DRV_NAME        "iwlwifi"
 #define IWLWIFI_VERSION "in-tree:"
-#define DRV_COPYRIGHT   "Copyright(c) 2003-2011 Intel Corporation"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2012 Intel Corporation"
 #define DRV_AUTHOR     "<ilw@linux.intel.com>"
 
 extern struct iwl_mod_params iwlagn_mod_params;
@@ -264,11 +264,13 @@ enum iwl_pa_type {
  *                      LED ON  = RF ON
  *                      LED OFF = RF OFF
  *    IWL_LED_BLINK:    adjust led blink rate based on blink table
+ *    IWL_LED_DISABLE:  led disabled
  */
 enum iwl_led_mode {
         IWL_LED_DEFAULT,
         IWL_LED_RF_STATE,
         IWL_LED_BLINK,
+        IWL_LED_DISABLE,
 };
 
 /**
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 4a5cddd2d56b..a56a77b8f926 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
 
         [IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },
         [IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_TYPE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_INST_SIZE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_DATA_SIZE] = { .type = NLA_U32, },
 };
 
 /*
@@ -299,7 +302,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_READ32:
-                val32 = iwl_read32(bus(priv), ofs);
+                val32 = iwl_read_direct32(bus(priv), ofs);
                 IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
 
                 skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
@@ -321,7 +324,7 @@ static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
                 } else {
                         val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
                         IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
-                        iwl_write32(bus(priv), ofs, val32);
+                        iwl_write_direct32(bus(priv), ofs, val32);
                 }
                 break;
         case IWL_TM_CMD_APP2DEV_DIRECT_REG_WRITE8:
@@ -422,7 +425,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
         int status = 0, rsp_data_len = 0;
-        u32 devid;
+        u32 devid, inst_size = 0, data_size = 0;
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
@@ -548,6 +551,41 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                         "Error sending msg : %d\n", status);
                 break;
 
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20 + 8);
+                if (!skb) {
+                        IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                switch (priv->shrd->ucode_type) {
+                case IWL_UCODE_REGULAR:
+                        inst_size = trans(priv)->ucode_rt.code.len;
+                        data_size = trans(priv)->ucode_rt.data.len;
+                        break;
+                case IWL_UCODE_INIT:
+                        inst_size = trans(priv)->ucode_init.code.len;
+                        data_size = trans(priv)->ucode_init.data.len;
+                        break;
+                case IWL_UCODE_WOWLAN:
+                        inst_size = trans(priv)->ucode_wowlan.code.len;
+                        data_size = trans(priv)->ucode_wowlan.data.len;
+                        break;
+                case IWL_UCODE_NONE:
+                        IWL_DEBUG_INFO(priv, "The uCode has not been loaded\n");
+                        break;
+                default:
+                        IWL_DEBUG_INFO(priv, "Unsupported uCode type\n");
+                        break;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");
                 return -ENOSYS;
@@ -733,7 +771,7 @@ static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
 static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
 {
         struct iwl_priv *priv = hw->priv;
-        u32 base, ofs, size, maxsize;
+        u32 ofs, size, maxsize;
 
         if (priv->testmode_sram.sram_readed)
                 return -EBUSY;
@@ -759,25 +797,24 @@ static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
                 maxsize = trans(priv)->ucode_wowlan.data.len;
                 break;
         case IWL_UCODE_NONE:
-                IWL_DEBUG_INFO(priv, "Error, uCode does not been loaded\n");
+                IWL_ERR(priv, "Error, uCode does not been loaded\n");
                 return -ENOSYS;
         default:
-                IWL_DEBUG_INFO(priv, "Error, unsupported uCode type\n");
+                IWL_ERR(priv, "Error, unsupported uCode type\n");
                 return -ENOSYS;
         }
-        if ((ofs + size) > maxsize) {
-                IWL_DEBUG_INFO(priv, "Invalid offset/size: out of range\n");
+        if ((ofs + size) > (maxsize + SRAM_DATA_SEG_OFFSET)) {
+                IWL_ERR(priv, "Invalid offset/size: out of range\n");
                 return -EINVAL;
         }
         priv->testmode_sram.buff_size = (size / 4) * 4;
         priv->testmode_sram.buff_addr =
                 kmalloc(priv->testmode_sram.buff_size, GFP_KERNEL);
         if (priv->testmode_sram.buff_addr == NULL) {
-                IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                IWL_ERR(priv, "Error allocating memory\n");
                 return -ENOMEM;
         }
-        base = 0x800000;
-        _iwl_read_targ_mem_words(bus(priv), base + ofs,
+        _iwl_read_targ_mem_words(bus(priv), ofs,
                                         priv->testmode_sram.buff_addr,
                                         priv->testmode_sram.buff_size / 4);
         priv->testmode_sram.num_chunks =
@@ -882,6 +919,7 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
         case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
         case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
         case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
                 IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
                 result = iwl_testmode_driver(hw, tb);
                 break;
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h
index 26138f110340..f97d06169b45 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,15 +111,17 @@
  *
  * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_READ32:
  * @IWL_TM_CMD_APP2DEV_INDIRECT_REG_WRITE32:
- *      commands from user applicaiton to indirectly access peripheral register
+ *      commands from user application to indirectly access peripheral register
  *
  * @IWL_TM_CMD_APP2DEV_READ_SRAM:
  * @IWL_TM_CMD_APP2DEV_DUMP_SRAM:
- *      commands from user applicaiton to read data in sram
+ *      commands from user application to read data in sram
  *
- * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Weak On Wireless LAN uCode image
+ * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Wake On Wireless LAN uCode image
  * @IWL_TM_CMD_APP2DEV_GET_FW_VERSION: retrieve uCode version
  * @IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: retrieve ID information in device
+ * @IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+ *      retrieve information of existing loaded uCode image
  *
  */
 enum iwl_tm_cmd_t {
@@ -147,7 +149,8 @@ enum iwl_tm_cmd_t {
         IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW       = 22,
         IWL_TM_CMD_APP2DEV_GET_FW_VERSION       = 23,
         IWL_TM_CMD_APP2DEV_GET_DEVICE_ID        = 24,
-        IWL_TM_CMD_MAX                          = 25,
+        IWL_TM_CMD_APP2DEV_GET_FW_INFO          = 25,
+        IWL_TM_CMD_MAX                          = 26,
 };
 
 /*
@@ -237,6 +240,15 @@ enum iwl_tm_cmd_t {
  *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_DEVICE_ID,
  *      IWL_TM_ATTR_DEVICE_ID for the device ID information
  *
+ * @IWL_TM_ATTR_FW_TYPE:
+ * @IWL_TM_ATTR_FW_INST_SIZE:
+ * @IWL_TM_ATTR_FW_DATA_SIZE:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_FW_INFO,
+ *      The mandatory fields are:
+ *      IWL_TM_ATTR_FW_TYPE for the uCode type (INIT/RUNTIME/...)
+ *      IWL_TM_ATTR_FW_INST_SIZE for the size of instruction section
+ *      IWL_TM_ATTR_FW_DATA_SIZE for the size of data section
+ *
  */
 enum iwl_tm_attr_t {
         IWL_TM_ATTR_NOT_APPLICABLE              = 0,
@@ -259,7 +271,10 @@ enum iwl_tm_attr_t {
         IWL_TM_ATTR_SRAM_DUMP                   = 17,
         IWL_TM_ATTR_FW_VERSION                  = 18,
         IWL_TM_ATTR_DEVICE_ID                   = 19,
-        IWL_TM_ATTR_MAX                         = 20,
+        IWL_TM_ATTR_FW_TYPE                     = 20,
+        IWL_TM_ATTR_FW_INST_SIZE                = 21,
+        IWL_TM_ATTR_FW_DATA_SIZE                = 22,
+        IWL_TM_ATTR_MAX                         = 23,
 };
 
 /* uCode trace buffer */
@@ -271,4 +286,7 @@ enum iwl_tm_attr_t {
 /* Maximum data size of each dump it packet */
 #define DUMP_CHUNK_SIZE         (PAGE_SIZE - 1024)
 
+/* Address offset of data segment in SRAM */
+#define SRAM_DATA_SEG_OFFSET   0x800000
+
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index f6debf91d7b5..0ac9b4d30271 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 65d1f05007be..2900db973aaa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
index bd29568177e6..30814b55705e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2012 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 324d06dfb690..3c64c4e5885b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c
index 1b20c4fb791b..506c062343b2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.c
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index e6bf3f554772..42a9f303f543 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2007 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 36a1b5b25858..2edf0ef65a5b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -2,7 +2,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/iwlwifi/iwl-wifi.h b/drivers/net/wireless/iwlwifi/iwl-wifi.h
index 18501101a530..7e6eb20823cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-wifi.h
+++ b/drivers/net/wireless/iwlwifi/iwl-wifi.h
@@ -5,7 +5,7 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 079e5532e686..ea6832dc6677 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -182,7 +182,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
         skb_reserve(skb_aggr, headroom + sizeof(struct txpd));
         tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);
 
-        tx_info_aggr->bss_index = tx_info_src->bss_index;
+        tx_info_aggr->bss_type = tx_info_src->bss_type;
+        tx_info_aggr->bss_num = tx_info_src->bss_num;
         skb_aggr->priority = skb_src->priority;
 
         do {
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index c3b6c4652cd6..6fef4925d13a 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -79,7 +79,7 @@ static int
 mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
                          u8 key_index, bool pairwise, const u8 *mac_addr)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         if (mwifiex_set_encode(priv, NULL, 0, key_index, 1)) {
                 wiphy_err(wiphy, "deleting the crypto keys\n");
@@ -122,7 +122,7 @@ mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
                                 struct net_device *dev,
                                 bool enabled, int timeout)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         u32 ps_mode;
 
         if (timeout)
@@ -143,7 +143,7 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
                                  u8 key_index, bool unicast,
                                  bool multicast)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         /* Return if WEP key not configured */
         if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED)
@@ -165,7 +165,7 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
                          u8 key_index, bool pairwise, const u8 *mac_addr,
                          struct key_params *params)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
 
         if (mwifiex_set_encode(priv, params->key, params->key_len,
                                                         key_index, 0)) {
@@ -376,7 +376,7 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
                              struct ieee80211_channel *chan,
                              enum nl80211_channel_type channel_type)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         if (priv->media_connected) {
                 wiphy_err(wiphy, "This setting is valid only when station "
@@ -557,6 +557,23 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
         /* bit rate is in 500 kb/s units. Convert it to 100kb/s units */
         sinfo->txrate.legacy = rate.rate * 5;
 
+        if (priv->bss_mode == NL80211_IFTYPE_STATION) {
+                sinfo->filled |= STATION_INFO_BSS_PARAM;
+                sinfo->bss_param.flags = 0;
+                if (priv->curr_bss_params.bss_descriptor.cap_info_bitmap &
+                                                WLAN_CAPABILITY_SHORT_PREAMBLE)
+                        sinfo->bss_param.flags |=
+                                        BSS_PARAM_FLAGS_SHORT_PREAMBLE;
+                if (priv->curr_bss_params.bss_descriptor.cap_info_bitmap &
+                                                WLAN_CAPABILITY_SHORT_SLOT_TIME)
+                        sinfo->bss_param.flags |=
+                                        BSS_PARAM_FLAGS_SHORT_SLOT_TIME;
+                sinfo->bss_param.dtim_period =
+                        priv->curr_bss_params.bss_descriptor.dtim_period;
+                sinfo->bss_param.beacon_interval =
+                        priv->curr_bss_params.bss_descriptor.beacon_period;
+        }
+
         return ret;
 }
 
@@ -1004,7 +1021,7 @@ static int
 mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_ibss_params *params)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         int ret = 0;
 
         if (priv->bss_mode != NL80211_IFTYPE_ADHOC) {
@@ -1042,7 +1059,7 @@ done:
 static int
 mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         wiphy_dbg(wiphy, "info: disconnecting from essid %pM\n",
                         priv->cfg_bssid);
@@ -1217,7 +1234,6 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
                 priv->bss_priority = 0;
                 priv->bss_role = MWIFIEX_BSS_ROLE_STA;
-                priv->bss_index = 0;
                 priv->bss_num = 0;
 
                 break;
@@ -1281,10 +1297,7 @@ EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
  */
 int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
 {
-        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
-
-        if (!priv || !dev)
-                return 0;
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
 #ifdef CONFIG_DEBUG_FS
         mwifiex_dev_debugfs_remove(priv);
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 6e0a3eaecf70..6623db69e157 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -391,7 +391,8 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter)
 
         if (skb) {
                 rx_info = MWIFIEX_SKB_RXCB(skb);
-                rx_info->bss_index = priv->bss_index;
+                rx_info->bss_num = priv->bss_num;
+                rx_info->bss_type = priv->bss_type;
         }
 
         if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE) {
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index ae17ce02a3d0..3735c775495c 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -102,7 +102,8 @@ struct mwifiex_wait_queue {
 };
 
 struct mwifiex_rxinfo {
-        u8 bss_index;
+        u8 bss_num;
+        u8 bss_type;
         struct sk_buff *parent;
         u8 use_count;
 };
@@ -110,7 +111,8 @@ struct mwifiex_rxinfo {
 struct mwifiex_txinfo {
         u32 status_code;
         u8 flags;
-        u8 bss_index;
+        u8 bss_num;
+        u8 bss_type;
 };
 
 enum mwifiex_wmm_ac_e {
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index e05b417a3fae..e13b6d99171a 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -526,8 +526,9 @@ static void mwifiex_delete_bss_prio_tbl(struct mwifiex_private *priv)
                 cur = &adapter->bss_prio_tbl[i].bss_prio_cur;
                 lock = &adapter->bss_prio_tbl[i].bss_prio_lock;
                 dev_dbg(adapter->dev, "info: delete BSS priority table,"
-                                " index = %d, i = %d, head = %p, cur = %p\n",
-                              priv->bss_index, i, head, *cur);
+                                " bss_type = %d, bss_num = %d, i = %d,"
+                                " head = %p, cur = %p\n",
+                              priv->bss_type, priv->bss_num, i, head, *cur);
                 if (*cur) {
                         spin_lock_irqsave(lock, flags);
                         if (list_empty(head)) {
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 84be196188cc..80e44566bf6e 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -424,8 +424,8 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         struct sk_buff *new_skb;
         struct mwifiex_txinfo *tx_info;
 
-        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d): Data <= kernel\n",
-                                jiffies, priv->bss_index);
+        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d-%d): Data <= kernel\n",
+                                jiffies, priv->bss_type, priv->bss_num);
 
         if (priv->adapter->surprise_removed) {
                 kfree_skb(skb);
@@ -458,10 +458,11 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        tx_info->bss_index = priv->bss_index;
+        tx_info->bss_num = priv->bss_num;
+        tx_info->bss_type = priv->bss_type;
         mwifiex_fill_buffer(skb);
 
-        mwifiex_wmm_add_buf_txqueue(priv->adapter, skb);
+        mwifiex_wmm_add_buf_txqueue(priv, skb);
         atomic_inc(&priv->adapter->tx_pending);
 
         if (atomic_read(&priv->adapter->tx_pending) >= MAX_TX_PENDING) {
@@ -531,8 +532,8 @@ mwifiex_tx_timeout(struct net_device *dev)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
-        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_index=%d\n",
-                                jiffies, priv->bss_index);
+        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_type-num = %d-%d\n",
+                                jiffies, priv->bss_type, priv->bss_num);
         mwifiex_set_trans_start(dev);
         priv->num_tx_timeout++;
 }
@@ -605,18 +606,6 @@ int is_command_pending(struct mwifiex_adapter *adapter)
 }
 
 /*
- * This function returns the correct private structure pointer based
- * upon the BSS number.
- */
-struct mwifiex_private *
-mwifiex_bss_index_to_priv(struct mwifiex_adapter *adapter, u8 bss_index)
-{
-        if (!adapter || (bss_index >= adapter->priv_num))
-                return NULL;
-        return adapter->priv[bss_index];
-}
-
-/*
  * This is the main work queue function.
  *
  * It handles the main process, which in turn handles the complete
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 3186aa437f42..3dc0f721c1db 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -249,6 +249,7 @@ struct mwifiex_bssdescriptor {
         u32 channel;
         u32 freq;
         u16 beacon_period;
+        u8 dtim_period;
         u8 erp_flags;
         u32 bss_mode;
         u8 supported_rates[MWIFIEX_SUPPORTED_RATES];
@@ -352,7 +353,6 @@ struct mwifiex_private;
 
 struct mwifiex_private {
         struct mwifiex_adapter *adapter;
-        u8 bss_index;
         u8 bss_type;
         u8 bss_role;
         u8 bss_priority;
@@ -884,8 +884,6 @@ mwifiex_netdev_get_priv(struct net_device *dev)
         return (struct mwifiex_private *) (*(unsigned long *) netdev_priv(dev));
 }
 
-struct mwifiex_private *mwifiex_bss_index_to_priv(struct mwifiex_adapter
-                                                *adapter, u8 bss_index);
 int mwifiex_init_shutdown_fw(struct mwifiex_private *priv,
                              u32 func_init_shutdown);
 int mwifiex_add_card(void *, struct semaphore *, struct mwifiex_if_ops *, u8);
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 6396d3318ead..135208596aff 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1086,6 +1086,7 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
         struct ieee_types_vendor_specific *vendor_ie;
         const u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 };
         const u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 };
+        struct ieee80211_tim_ie *tim_ie;
 
         found_data_rate_ie = false;
         rate_size = 0;
@@ -1258,6 +1259,11 @@ mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
                         break;
+                case WLAN_EID_TIM:
+                        tim_ie = (void *) (current_ptr +
+                                         sizeof(struct ieee_types_header));
+                        bss_entry->dtim_period = tim_ie->dtim_period;
+                        break;
                 default:
                         break;
                 }
@@ -2001,7 +2007,7 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
                 kfree(priv->curr_bcn_buf);
                 priv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,
-                                                GFP_KERNEL);
+                                                GFP_ATOMIC);
                 if (!priv->curr_bcn_buf) {
                         dev_err(priv->adapter->dev,
                                         "failed to alloc curr_bcn_buf\n");
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index 5e1ef7e5da4f..d7a5d7616f22 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -43,7 +43,8 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,
 {
         int ret;
         struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
-        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+        struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+                        rx_info->bss_num, rx_info->bss_type);
         struct rx_packet_hdr *rx_pkt_hdr;
         struct rxpd *local_rx_pd;
         int hdr_chop;
@@ -124,7 +125,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
         struct rx_packet_hdr *rx_pkt_hdr;
         u8 ta[ETH_ALEN];
         u16 rx_pkt_type;
-        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+        struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+                        rx_info->bss_num, rx_info->bss_type);
 
         if (!priv)
                 return -1;
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
index d97facd70e88..94d31a94620a 100644
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -136,7 +136,8 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
                 return -1;
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        tx_info->bss_index = priv->bss_index;
+        tx_info->bss_num = priv->bss_num;
+        tx_info->bss_type = priv->bss_type;
         skb_reserve(skb, sizeof(struct txpd) + INTF_HEADER_LEN);
         skb_push(skb, sizeof(struct txpd));
 
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index d9274a1b77ac..9a6eacc9d6f9 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -48,7 +48,8 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,
         if (!priv)
                 priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
 
-        rx_info->bss_index = priv->bss_index;
+        rx_info->bss_num = priv->bss_num;
+        rx_info->bss_type = priv->bss_type;
 
         return mwifiex_process_sta_rx_packet(adapter, skb);
 }
@@ -130,7 +131,8 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
                 return 0;
 
         tx_info = MWIFIEX_SKB_TXCB(skb);
-        priv = mwifiex_bss_index_to_priv(adapter, tx_info->bss_index);
+        priv = mwifiex_get_priv_by_id(adapter, tx_info->bss_num,
+                        tx_info->bss_type);
         if (!priv)
                 goto done;
 
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 06976f517f66..9c48f37069f7 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -159,7 +159,8 @@ int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 return -1;
 
         rx_info = MWIFIEX_SKB_RXCB(skb);
-        priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index);
+        priv = mwifiex_get_priv_by_id(adapter, rx_info->bss_num,
+                        rx_info->bss_type);
         if (!priv)
                 return -1;
 
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 6c239c3c8249..75f79ef9f6cf 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -599,11 +599,10 @@ mwifiex_is_ralist_valid(struct mwifiex_private *priv,
  * is queued at the list tail.
  */
 void
-mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
+mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
                             struct sk_buff *skb)
 {
-        struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
-        struct mwifiex_private *priv = adapter->priv[tx_info->bss_index];
+        struct mwifiex_adapter *adapter = priv->adapter;
         u32 tid;
         struct mwifiex_ra_list_tbl *ra_list;
         u8 ra[ETH_ALEN], tid_down;
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h
index fcea1f68792f..ec839952d2e7 100644
--- a/drivers/net/wireless/mwifiex/wmm.h
+++ b/drivers/net/wireless/mwifiex/wmm.h
@@ -80,8 +80,8 @@ mwifiex_wmm_is_ra_list_empty(struct list_head *ra_list_hhead)
         return true;
 }
 
-void mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
-                                 struct sk_buff *skb);
+void mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
+                                        struct sk_buff *skb);
 void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra);
 
 int mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter);
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index dd5aeaff44ba..fd125473be7a 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4093,7 +4093,7 @@ static int mwl8k_set_key(struct ieee80211_hw *hw,
                 return -EOPNOTSUPP;
 
         if (sta == NULL)
-                addr = hw->wiphy->perm_addr;
+                addr = vif->addr;
         else
                 addr = sta->addr;
 
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index ae8ce56670b6..f634d4582bfe 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1754,11 +1754,6 @@ static struct usb_driver orinoco_driver = {
         .id_table = ezusb_table,
 };
 
-/* Can't be declared "const" or the whole __initdata section will
- * become const */
-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
-        " (Manuel Estrada Sainz)";
-
 module_usb_driver(orinoco_driver);
 
 MODULE_AUTHOR("Manuel Estrada Sainz");
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index af2ca1a9c7d3..40f4eb7da7b2 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -228,6 +228,8 @@ static int p54_add_interface(struct ieee80211_hw *dev,
 {
         struct p54_common *priv = dev->priv;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
+
         mutex_lock(&priv->conf_mutex);
         if (priv->mode != NL80211_IFTYPE_MONITOR) {
                 mutex_unlock(&priv->conf_mutex);
@@ -734,7 +736,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
                      IEEE80211_HW_SIGNAL_DBM |
                      IEEE80211_HW_SUPPORTS_PS |
                      IEEE80211_HW_PS_NULLFUNC_STACK |
-                     IEEE80211_HW_BEACON_FILTER |
                      IEEE80211_HW_REPORTS_TX_ACK_STATUS;
 
         dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 7bef66def10c..dbe7ece862f2 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -412,18 +412,6 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         /*
-         * Disable DMA, will be reenabled later when enabling
-         * the radio.
-         */
-        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_RX_DMA_BUSY, 0);
-        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_TX_WRITEBACK_DONE, 1);
-        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
-
-        /*
          * Write firmware to the device.
          */
         rt2800_drv_write_firmware(rt2x00dev, data, len);
@@ -444,10 +432,21 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
         }
 
         /*
+         * Disable DMA, will be reenabled later when enabling
+         * the radio.
+         */
+        rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
+        rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_RX_DMA, 0);
+        rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
+
+        /*
          * Initialize firmware.
          */
         rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
+        if (rt2x00_is_usb(rt2x00dev))
+                rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
         msleep(1);
 
         return 0;
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index dc88baefa72e..4e985026985c 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -489,7 +489,7 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev)
 
         rt2x00pci_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
 
-        rt2x00pci_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        reg = 0;
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
         rt2x00pci_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 262ee9eefb6f..f0074bcee7c9 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -226,9 +226,7 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00usb_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
         rt2x00usb_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);
 
-        rt2x00usb_register_write(rt2x00dev, PWR_PIN_CFG, 0x00000003);
-
-        rt2x00usb_register_read(rt2x00dev, MAC_SYS_CTRL, &reg);
+        reg = 0;
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
         rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_BBP, 1);
         rt2x00usb_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index d6c42e69bdbd..44b9c0a57702 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -49,6 +49,11 @@ config RTLWIFI
         depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
         default m
 
+config RTLWIFI_DEBUG
+        tristate "Additional debugging output"
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        default y
+
 config RTL8192C_COMMON
         tristate
         depends on RTL8192CE || RTL8192CU
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 8d6eb0f56c03..df5655cc55c0 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.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,10 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/ip.h>
-#include <linux/module.h>
 #include "wifi.h"
 #include "rc.h"
 #include "base.h"
@@ -39,6 +35,9 @@
 #include "ps.h"
 #include "regd.h"
 
+#include <linux/ip.h>
+#include <linux/module.h>
+
 /*
  *NOTICE!!!: This file will be very big, we hsould
  *keep it clear under follwing roles:
@@ -211,7 +210,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
          */
         if (get_rf_type(rtlphy) == RF_1T2R || get_rf_type(rtlphy) == RF_2T2R) {
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T2R or 2T2R\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T2R or 2T2R\n");
 
                 ht_cap->mcs.rx_mask[0] = 0xFF;
                 ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -220,7 +219,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw,
                 ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
         } else if (get_rf_type(rtlphy) == RF_1T1R) {
 
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T1R\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "1T1R\n");
 
                 ht_cap->mcs.rx_mask[0] = 0xFF;
                 ht_cap->mcs.rx_mask[1] = 0x00;
@@ -302,15 +301,13 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
                         /* <4> set mac->sband to wiphy->sband */
                         hw->wiphy->bands[IEEE80211_BAND_5GHZ] = sband;
                 } else {
-                        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Err BAND %d\n",
-                                 rtlhal->current_bandtype));
+                        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Err BAND %d\n",
+                                 rtlhal->current_bandtype);
                 }
         }
         /* <5> set hw caps */
         hw->flags = IEEE80211_HW_SIGNAL_DBM |
             IEEE80211_HW_RX_INCLUDES_FCS |
-            IEEE80211_HW_BEACON_FILTER |
             IEEE80211_HW_AMPDU_AGGREGATION |
             IEEE80211_HW_CONNECTION_MONITOR |
             /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
@@ -413,6 +410,7 @@ void rtl_init_rfkill(struct ieee80211_hw *hw)
 
         wiphy_rfkill_start_polling(hw->wiphy);
 }
+EXPORT_SYMBOL(rtl_init_rfkill);
 
 void rtl_deinit_rfkill(struct ieee80211_hw *hw)
 {
@@ -436,13 +434,13 @@ int rtl_init_core(struct ieee80211_hw *hw)
          * mac80211 hw  in _rtl_init_mac80211.
          */
         if (rtl_regd_init(hw, rtl_reg_notifier)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("REGD init failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "REGD init failed\n");
                 return 1;
         } else {
                 /* CRDA regd hint must after init CRDA */
                 if (regulatory_hint(hw->wiphy, rtlpriv->regd.alpha2)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 ("regulatory_hint fail\n"));
+                                 "regulatory_hint fail\n");
                 }
         }
 
@@ -922,17 +920,17 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                 return false;
 
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("%s ACT_ADDBAREQ From :%pM\n",
-                                  is_tx ? "Tx" : "Rx", hdr->addr2));
+                                 "%s ACT_ADDBAREQ From :%pM\n",
+                                 is_tx ? "Tx" : "Rx", hdr->addr2);
                         break;
                 case ACT_ADDBARSP:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("%s ACT_ADDBARSP From :%pM\n",
-                                  is_tx ? "Tx" : "Rx", hdr->addr2));
+                                 "%s ACT_ADDBARSP From :%pM\n",
+                                 is_tx ? "Tx" : "Rx", hdr->addr2);
                         break;
                 case ACT_DELBA:
                         RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                                 ("ACT_ADDBADEL From :%pM\n", hdr->addr2));
+                                 "ACT_ADDBADEL From :%pM\n", hdr->addr2);
                         break;
                 }
                 break;
@@ -975,8 +973,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                                  * 67 : UDP BOOTP server
                                  */
                                 RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV),
-                                         DBG_DMESG, ("dhcp %s !!\n",
-                                                     (is_tx) ? "Tx" : "Rx"));
+                                         DBG_DMESG, "dhcp %s !!\n",
+                                         is_tx ? "Tx" : "Rx");
 
                                 if (is_tx) {
                                         rtl_lps_leave(hw);
@@ -996,7 +994,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
                 return true;
         } else if (ETH_P_PAE == ether_type) {
                 RT_TRACE(rtlpriv, (COMP_SEND | COMP_RECV), DBG_DMESG,
-                         ("802.1X %s EAPOL pkt!!\n", (is_tx) ? "Tx" : "Rx"));
+                         "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx");
 
                 if (is_tx) {
                         rtl_lps_leave(hw);
@@ -1036,9 +1034,8 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw,
                 return -ENXIO;
         tid_data = &sta_entry->tids[tid];
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d seq:%d\n", sta->addr, tid,
-                 tid_data->seq_number));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d seq:%d\n",
+                 sta->addr, tid, tid_data->seq_number);
 
         *ssn = tid_data->seq_number;
         tid_data->agg.agg_state = RTL_AGG_START;
@@ -1059,12 +1056,12 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw,
                 return -EINVAL;
 
         if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
                 return -EINVAL;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d\n", sta->addr, tid));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
+                 sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
@@ -1087,12 +1084,12 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,
                 return -EINVAL;
 
         if (!sta->addr) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("ra = NULL\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "ra = NULL\n");
                 return -EINVAL;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG,
-                 ("on ra = %pM tid = %d\n", sta->addr, tid));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "on ra = %pM tid = %d\n",
+                 sta->addr, tid);
 
         if (unlikely(tid >= MAX_TID_COUNT))
                 return -EINVAL;
@@ -1474,29 +1471,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len)
                 (memcmp(mac->bssid, ap5_6, 3) == 0) ||
                 vendor == PEER_ATH) {
                 vendor = PEER_ATH;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ath find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ath find\n");
         } else if ((memcmp(mac->bssid, ap4_4, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_5, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_1, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_2, 3) == 0) ||
                 (memcmp(mac->bssid, ap4_3, 3) == 0) ||
                 vendor == PEER_RAL) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>ral findn\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>ral find\n");
                 vendor = PEER_RAL;
         } else if (memcmp(mac->bssid, ap6_1, 3) == 0 ||
                 vendor == PEER_CISCO) {
                 vendor = PEER_CISCO;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>cisco find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>cisco find\n");
         } else if ((memcmp(mac->bssid, ap3_1, 3) == 0) ||
                 (memcmp(mac->bssid, ap3_2, 3) == 0) ||
                 (memcmp(mac->bssid, ap3_3, 3) == 0) ||
                 vendor == PEER_BROAD) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>broad find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>broad find\n");
                 vendor = PEER_BROAD;
         } else if (memcmp(mac->bssid, ap7_1, 3) == 0 ||
                 vendor == PEER_MARV) {
                 vendor = PEER_MARV;
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("=>marv find\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "=>marv find\n");
         }
 
         mac->vendor = vendor;
diff --git a/drivers/net/wireless/rtlwifi/base.h b/drivers/net/wireless/rtlwifi/base.h
index f66b5757f6b9..5a23a6d0f49d 100644
--- a/drivers/net/wireless/rtlwifi/base.h
+++ b/drivers/net/wireless/rtlwifi/base.h
@@ -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
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? */
diff --git a/drivers/net/wireless/rtlwifi/cam.h b/drivers/net/wireless/rtlwifi/cam.h
index c62da4eefc75..35e00086a520 100644
--- a/drivers/net/wireless/rtlwifi/cam.h
+++ b/drivers/net/wireless/rtlwifi/cam.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 3f0f056fae9c..f231b9180436 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.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
@@ -31,8 +31,50 @@
 #include "core.h"
 #include "cam.h"
 #include "base.h"
+#include "pci.h"
 #include "ps.h"
 
+#include <linux/export.h>
+
+void rtl_fw_cb(const struct firmware *firmware, void *context)
+{
+        struct ieee80211_hw *hw = context;
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        int err;
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "Firmware callback routine entered!\n");
+        complete(&rtlpriv->firmware_loading_complete);
+        if (!firmware) {
+                pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
+                rtlpriv->max_fw_size = 0;
+                return;
+        }
+        if (firmware->size > rtlpriv->max_fw_size) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is too big!\n");
+                release_firmware(firmware);
+                return;
+        }
+        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
+        rtlpriv->rtlhal.fwsize = firmware->size;
+        release_firmware(firmware);
+
+        err = ieee80211_register_hw(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't register mac80211 hw\n");
+                return;
+        } else {
+                rtlpriv->mac80211.mac80211_registered = 1;
+        }
+        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
+
+        /*init rfkill */
+        rtl_init_rfkill(hw);
+}
+EXPORT_SYMBOL(rtl_fw_cb);
+
 /*mutex for start & stop is must here. */
 static int rtl_op_start(struct ieee80211_hw *hw)
 {
@@ -112,9 +154,11 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         int err = 0;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
+
         if (mac->vif) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("vif has been set!! mac->vif = 0x%p\n", mac->vif));
+                         "vif has been set!! mac->vif = 0x%p\n", mac->vif);
                 return -EOPNOTSUPP;
         }
 
@@ -125,7 +169,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
         case NL80211_IFTYPE_STATION:
                 if (mac->beacon_enabled == 1) {
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("NL80211_IFTYPE_STATION\n"));
+                                 "NL80211_IFTYPE_STATION\n");
                         mac->beacon_enabled = 0;
                         rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
                                         rtlpriv->cfg->maps
@@ -134,7 +178,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         case NL80211_IFTYPE_ADHOC:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("NL80211_IFTYPE_ADHOC\n"));
+                         "NL80211_IFTYPE_ADHOC\n");
 
                 mac->link_state = MAC80211_LINKED;
                 rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -148,7 +192,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         case NL80211_IFTYPE_AP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("NL80211_IFTYPE_AP\n"));
+                         "NL80211_IFTYPE_AP\n");
 
                 mac->link_state = MAC80211_LINKED;
                 rtlpriv->cfg->ops->set_bcn_reg(hw);
@@ -161,7 +205,7 @@ static int rtl_op_add_interface(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("operation mode %d is not support!\n", vif->type));
+                         "operation mode %d is not supported!\n", vif->type);
                 err = -EOPNOTSUPP;
                 goto out;
         }
@@ -221,7 +265,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
         mutex_lock(&rtlpriv->locks.conf_mutex);
         if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {  /*BIT(2)*/
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n"));
+                         "IEEE80211_CONF_CHANGE_LISTEN_INTERVAL\n");
         }
 
         /*For IPS */
@@ -252,10 +296,12 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                          * because that will cause nullfunc send by mac80211
                          * fail, and cause pkt loss, we have tested that 5mA
                          * is worked very well */
-                        if (!rtlpriv->psc.multi_buffered)
+                        if (!rtlpriv->psc.multi_buffered) {
                                 queue_delayed_work(rtlpriv->works.rtl_wq,
                                                 &rtlpriv->works.ps_work,
                                                 MSECS(5));
+                                pr_info("In section\n");
+                        }
                 } else {
                         rtl_swlps_rf_awake(hw);
                         rtlpriv->psc.sw_ps_enabled = false;
@@ -264,8 +310,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 
         if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",
-                          hw->conf.long_frame_max_tx_count));
+                         "IEEE80211_CONF_CHANGE_RETRY_LIMITS %x\n",
+                         hw->conf.long_frame_max_tx_count);
                 mac->retry_long = hw->conf.long_frame_max_tx_count;
                 mac->retry_short = hw->conf.long_frame_max_tx_count;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RETRY_LIMIT,
@@ -320,7 +366,7 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
                 default:
                         mac->bw_40 = false;
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("switch case not processed\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -369,12 +415,12 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AM] |
                             rtlpriv->cfg->maps[MAC_RCR_AB];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive multicast frame.\n"));
+                                 "Enable receive multicast frame\n");
                 } else {
                         mac->rx_conf &= ~(rtlpriv->cfg->maps[MAC_RCR_AM] |
                                           rtlpriv->cfg->maps[MAC_RCR_AB]);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive multicast frame.\n"));
+                                 "Disable receive multicast frame\n");
                 }
         }
 
@@ -382,11 +428,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                 if (*new_flags & FIF_FCSFAIL) {
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive FCS error frame.\n"));
+                                 "Enable receive FCS error frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACRC32];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive FCS error frame.\n"));
+                                 "Disable receive FCS error frame\n");
                 }
         }
 
@@ -409,11 +455,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_ACF];
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive control frame.\n"));
+                                 "Enable receive control frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_ACF];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive control frame.\n"));
+                                 "Disable receive control frame\n");
                 }
         }
 
@@ -421,11 +467,11 @@ static void rtl_op_configure_filter(struct ieee80211_hw *hw,
                 if (*new_flags & FIF_OTHER_BSS) {
                         mac->rx_conf |= rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Enable receive other BSS's frame.\n"));
+                                 "Enable receive other BSS's frame\n");
                 } else {
                         mac->rx_conf &= ~rtlpriv->cfg->maps[MAC_RCR_AAP];
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                                 ("Disable receive other BSS's frame.\n"));
+                                 "Disable receive other BSS's frame\n");
                 }
         }
 }
@@ -456,7 +502,7 @@ static int rtl_op_sta_add(struct ieee80211_hw *hw,
                         sta_entry->wireless_mode = WIRELESS_MODE_G;
 
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                        ("Add sta addr is %pM\n", sta->addr));
+                         "Add sta addr is %pM\n", sta->addr);
                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
         }
         return 0;
@@ -469,7 +515,7 @@ static int rtl_op_sta_remove(struct ieee80211_hw *hw,
         struct rtl_sta_info *sta_entry;
         if (sta) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                        ("Remove sta addr is %pM\n", sta->addr));
+                         "Remove sta addr is %pM\n", sta->addr);
                 sta_entry = (struct rtl_sta_info *) sta->drv_priv;
                 sta_entry->wireless_mode = 0;
                 sta_entry->ratr_index = 0;
@@ -514,7 +560,7 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw,
 
         if (queue >= AC_MAX) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("queue number %d is incorrect!\n", queue));
+                         "queue number %d is incorrect!\n", queue);
                 return -EINVAL;
         }
 
@@ -547,7 +593,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                      bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 0) {
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                         ("BSS_CHANGED_BEACON_ENABLED\n"));
+                                         "BSS_CHANGED_BEACON_ENABLED\n");
 
                                 /*start hw beacon interrupt. */
                                 /*rtlpriv->cfg->ops->set_bcn_reg(hw); */
@@ -565,7 +611,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         !bss_conf->enable_beacon)) {
                         if (mac->beacon_enabled == 1) {
                                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                         ("ADHOC DISABLE BEACON\n"));
+                                         "ADHOC DISABLE BEACON\n");
 
                                 mac->beacon_enabled = 0;
                                 rtlpriv->cfg->ops->update_interrupt_mask(hw, 0,
@@ -575,7 +621,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 }
                 if (changed & BSS_CHANGED_BEACON_INT) {
                         RT_TRACE(rtlpriv, COMP_BEACON, DBG_TRACE,
-                                 ("BSS_CHANGED_BEACON_INT\n"));
+                                 "BSS_CHANGED_BEACON_INT\n");
                         mac->beacon_interval = bss_conf->beacon_int;
                         rtlpriv->cfg->ops->set_bcn_intv(hw);
                 }
@@ -604,7 +650,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         if (mac->opmode == NL80211_IFTYPE_STATION && sta)
                                 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 0);
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                 ("BSS_CHANGED_ASSOC\n"));
+                                 "BSS_CHANGED_ASSOC\n");
                 } else {
                         if (mac->link_state == MAC80211_LINKED)
                                 rtl_lps_leave(hw);
@@ -619,20 +665,20 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         mac->vendor = PEER_UNKNOWN;
 
                         RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                                 ("BSS_CHANGED_UN_ASSOC\n"));
+                                 "BSS_CHANGED_UN_ASSOC\n");
                 }
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_ERP_CTS_PROT\n"));
+                         "BSS_CHANGED_ERP_CTS_PROT\n");
                 mac->use_cts_protect = bss_conf->use_cts_prot;
         }
 
         if (changed & BSS_CHANGED_ERP_PREAMBLE) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD,
-                         ("BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",
-                          bss_conf->use_short_preamble));
+                         "BSS_CHANGED_ERP_PREAMBLE use short preamble:%x\n",
+                         bss_conf->use_short_preamble);
 
                 mac->short_preamble = bss_conf->use_short_preamble;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
@@ -641,7 +687,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_ERP_SLOT\n"));
+                         "BSS_CHANGED_ERP_SLOT\n");
 
                 if (bss_conf->use_short_slot)
                         mac->slot_time = RTL_SLOT_TIME_9;
@@ -653,8 +699,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
         }
 
         if (changed & BSS_CHANGED_HT) {
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("BSS_CHANGED_HT\n"));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE, "BSS_CHANGED_HT\n");
                 rcu_read_lock();
                 sta = get_sta(hw, vif, bss_conf->bssid);
                 if (sta) {
@@ -683,8 +728,8 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_BSSID,
                                               (u8 *) bss_conf->bssid);
 
-                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG,
-                         ("%pM\n", bss_conf->bssid));
+                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, "%pM\n",
+                         bss_conf->bssid);
 
                 mac->vendor = PEER_UNKNOWN;
                 memcpy(mac->bssid, bss_conf->bssid, 6);
@@ -831,30 +876,30 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_START: TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);
                 return rtl_tx_agg_start(hw, sta, tid, ssn);
                 break;
         case IEEE80211_AMPDU_TX_STOP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);
                 return rtl_tx_agg_stop(hw, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_TX_OPERATIONAL:TID:%d\n", tid);
                 rtl_tx_agg_oper(hw, sta, tid);
                 break;
         case IEEE80211_AMPDU_RX_START:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_RX_START:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_RX_START:TID:%d\n", tid);
                 break;
         case IEEE80211_AMPDU_RX_STOP:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
-                         ("IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid));
+                         "IEEE80211_AMPDU_RX_STOP:TID:%d\n", tid);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("IEEE80211_AMPDU_ERR!!!!:\n"));
+                         "IEEE80211_AMPDU_ERR!!!!:\n");
                 return -EOPNOTSUPP;
         }
         return 0;
@@ -867,7 +912,7 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw)
 
         mac->act_scanning = true;
 
-        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
 
         if (mac->link_state == MAC80211_LINKED) {
                 rtl_lps_leave(hw);
@@ -888,7 +933,7 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 
-        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_MAC80211, DBG_LOUD, "\n");
         mac->act_scanning = false;
         /* Dual mac */
         rtlpriv->rtlhal.load_imrandiqk_setting_for2g = false;
@@ -921,13 +966,13 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return -ENOSPC; /*User disabled HW-crypto */
         }
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                 ("%s hardware based encryption for keyidx: %d, mac: %pM\n",
-                  cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                  sta ? sta->addr : bcast_addr));
+                 "%s hardware based encryption for keyidx: %d, mac: %pM\n",
+                 cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
+                 sta ? sta->addr : bcast_addr);
         rtlpriv->sec.being_setkey = true;
         rtl_ips_nic_on(hw);
         mutex_lock(&rtlpriv->locks.conf_mutex);
@@ -936,24 +981,23 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         switch (key->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
                 key_type = WEP40_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:WEP40\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP40\n");
                 break;
         case WLAN_CIPHER_SUITE_WEP104:
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("alg:WEP104\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:WEP104\n");
                 key_type = WEP104_ENCRYPTION;
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 key_type = TKIP_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:TKIP\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:TKIP\n");
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
                 key_type = AESCCMP_ENCRYPTION;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("alg:CCMP\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "alg:CCMP\n");
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("alg_err:%x!!!!:\n", key->cipher));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "alg_err:%x!!!!\n",
+                         key->cipher);
                 goto out_unlock;
         }
         if (key_type == WEP40_ENCRYPTION ||
@@ -995,8 +1039,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                                 wep_only = true;
                         rtlpriv->sec.pairwise_enc_algorithm = key_type;
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                ("set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1"
-                                " TKIP:2 AES:4 WEP104:5)\n", key_type));
+                                 "set enable_hw_sec, key_type:%x(OPEN:0 WEP40:1 TKIP:2 AES:4 WEP104:5)\n",
+                                 key_type);
                         rtlpriv->cfg->ops->enable_hw_sec(hw);
                 }
         }
@@ -1005,7 +1049,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         case SET_KEY:
                 if (wep_only) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set WEP(group/pairwise) key\n"));
+                                 "set WEP(group/pairwise) key\n");
                         /* Pairwise key with an assigned MAC address. */
                         rtlpriv->sec.pairwise_enc_algorithm = key_type;
                         rtlpriv->sec.group_enc_algorithm = key_type;
@@ -1016,7 +1060,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         memcpy(mac_addr, zero_addr, ETH_ALEN);
                 } else if (group_key) { /* group key */
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set group key\n"));
+                                 "set group key\n");
                         /* group key */
                         rtlpriv->sec.group_enc_algorithm = key_type;
                         /*set local buf about group key. */
@@ -1026,10 +1070,10 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         memcpy(mac_addr, bcast_addr, ETH_ALEN);
                 } else {        /* pairwise key */
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("set pairwise key\n"));
+                                 "set pairwise key\n");
                         if (!sta) {
-                                RT_ASSERT(false, ("pairwise key withnot"
-                                                  "mac_addr\n"));
+                                RT_ASSERT(false,
+                                          "pairwise key without mac_addr\n");
 
                                 err = -EOPNOTSUPP;
                                 goto out_unlock;
@@ -1056,7 +1100,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
         case DISABLE_KEY:
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("disable key delete one entry\n"));
+                         "disable key delete one entry\n");
                 /*set local buf about wep key. */
                 if (mac->opmode == NL80211_IFTYPE_AP) {
                         if (sta)
@@ -1077,7 +1121,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("cmd_err:%x!!!!:\n", cmd));
+                         "cmd_err:%x!!!!\n", cmd);
         }
 out_unlock:
         mutex_unlock(&rtlpriv->locks.conf_mutex);
@@ -1106,8 +1150,8 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw)
                         rtlpriv->rfkill.rfkill_state = radio_state;
 
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 (KERN_INFO "wireless radio switch turned %s\n",
-                                  radio_state ? "on" : "off"));
+                                 "wireless radio switch turned %s\n",
+                                 radio_state ? "on" : "off");
 
                         blocked = (rtlpriv->rfkill.rfkill_state == 1) ? 0 : 1;
                         wiphy_rfkill_set_hw_state(hw->wiphy, blocked);
diff --git a/drivers/net/wireless/rtlwifi/core.h b/drivers/net/wireless/rtlwifi/core.h
index f02824a3b747..2fe46a1b4f1f 100644
--- a/drivers/net/wireless/rtlwifi/core.h
+++ b/drivers/net/wireless/rtlwifi/core.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -30,8 +30,6 @@
 #ifndef __RTL_CORE_H__
 #define __RTL_CORE_H__
 
-#include <net/mac80211.h>
-
 #define RTL_SUPPORTED_FILTERS           \
         (FIF_PROMISC_IN_BSS | \
         FIF_ALLMULTI | FIF_CONTROL | \
@@ -42,4 +40,6 @@
 #define RTL_SUPPORTED_CTRL_FILTER       0xFF
 
 extern const struct ieee80211_ops rtl_ops;
+void rtl_fw_cb(const struct firmware *firmware, void *context);
+
 #endif
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index 1b5cb7153a52..bdda9b2fffe1 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -28,6 +28,8 @@
 
 #include "wifi.h"
 
+#include <linux/moduleparam.h>
+
 void rtl_dbgp_flag_init(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
diff --git a/drivers/net/wireless/rtlwifi/debug.h b/drivers/net/wireless/rtlwifi/debug.h
index 160dd0685213..07493d2957f2 100644
--- a/drivers/net/wireless/rtlwifi/debug.h
+++ b/drivers/net/wireless/rtlwifi/debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -156,53 +156,78 @@ enum dbgp_flag_e {
         DBGP_TYPE_MAX
 };
 
-#define RT_ASSERT(_exp, fmt)                            \
-        do {                                            \
-                if (!(_exp)) {                  \
-                        printk(KERN_DEBUG "%s:%s(): ", KBUILD_MODNAME, \
-                        __func__);                      \
-                        printk fmt;                     \
-                } \
-        } while (0);
-
-#define RT_TRACE(rtlpriv, comp, level, fmt)\
-        do { \
-                if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) && \
-                        ((level) <= rtlpriv->dbg.global_debuglevel))) {\
-                        printk(KERN_DEBUG "%s:%s():<%lx-%x> ", KBUILD_MODNAME, \
-                        __func__, in_interrupt(), in_atomic()); \
-                        printk fmt;                             \
-                } \
-        } while (0);
-
-#define RTPRINT(rtlpriv, dbgtype, dbgflag, printstr)    \
-        do {                                            \
-                if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) { \
-                        printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);      \
-                        printk printstr;                \
-                }                                       \
-        } while (0);
-
-#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata, \
-                _hexdatalen) \
-        do {\
-                if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&\
-                        (_level <= rtlpriv->dbg.global_debuglevel)))    { \
-                        int __i;                                        \
-                        u8*     ptr = (u8 *)_hexdata;                   \
-                        printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);      \
-                        printk("In process \"%s\" (pid %i):", current->comm,\
-                                        current->pid); \
-                        printk(_titlestring);           \
-                        for (__i = 0; __i < (int)_hexdatalen; __i++) {  \
-                                printk("%02X%s", ptr[__i], (((__i + 1) % 4)\
-                                                        == 0) ? "  " : " ");\
-                                if (((__i + 1) % 16) == 0)              \
-                                        printk("\n");                   \
-                        }                               \
-                        printk(KERN_DEBUG "\n");                        \
-                } \
-        } while (0);
+#ifdef CONFIG_RTLWIFI_DEBUG
+
+#define RT_ASSERT(_exp, fmt, ...)                                       \
+do {                                                                    \
+        if (!(_exp)) {                                                  \
+                printk(KERN_DEBUG KBUILD_MODNAME ":%s(): " fmt,         \
+                       __func__, ##__VA_ARGS__);                        \
+        }                                                               \
+} while (0)
+
+#define RT_TRACE(rtlpriv, comp, level, fmt, ...)                        \
+do {                                                                    \
+        if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) &&  \
+                     ((level) <= rtlpriv->dbg.global_debuglevel))) {    \
+                printk(KERN_DEBUG KBUILD_MODNAME ":%s():<%lx-%x> " fmt, \
+                       __func__, in_interrupt(), in_atomic(),           \
+                       ##__VA_ARGS__);                                  \
+        }                                                               \
+} while (0)
+
+#define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...)                    \
+do {                                                                    \
+        if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) {      \
+                printk(KERN_DEBUG KBUILD_MODNAME ": " fmt,              \
+                       ##__VA_ARGS__);                                  \
+        }                                                               \
+} while (0)
+
+#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,   \
+                      _hexdatalen)                                      \
+do {                                                                    \
+        if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) && \
+                     (_level <= rtlpriv->dbg.global_debuglevel))) {     \
+                printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n", \
+                       KBUILD_MODNAME, current->comm, current->pid,     \
+                       _titlestring);                                   \
+                print_hex_dump_bytes("", DUMP_PREFIX_NONE,              \
+                                     _hexdata, _hexdatalen);            \
+        }                                                               \
+} while (0)
+
+#else
+
+struct rtl_priv;
+
+__printf(2, 3)
+static inline void RT_ASSERT(int exp, const char *fmt, ...)
+{
+}
+
+__printf(4, 5)
+static inline void RT_TRACE(struct rtl_priv *rtlpriv,
+                            int comp, int level,
+                            const char *fmt, ...)
+{
+}
+
+__printf(4, 5)
+static inline void RTPRINT(struct rtl_priv *rtlpriv,
+                           int dbgtype, int dbgflag,
+                           const char *fmt, ...)
+{
+}
+
+static inline void RT_PRINT_DATA(struct rtl_priv *rtlpriv,
+                                 int comp, int level,
+                                 const char *titlestring,
+                                 const void *hexdata, size_t hexdatalen)
+{
+}
+
+#endif
 
 void rtl_dbgp_flag_init(struct ieee80211_hw *hw);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index ed1058b71587..b24cbe6e16d8 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * Tmis 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
@@ -162,8 +162,8 @@ void efuse_write_1byte(struct ieee80211_hw *hw, u16 address, u8 value)
         const u32 efuse_len =
                 rtlpriv->cfg->maps[EFUSE_REAL_CONTENT_SIZE];
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("Addr=%x Data =%x\n", address, value));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr=%x Data =%x\n",
+                 address, value);
 
         if (address < efuse_len) {
                 rtl_write_byte(rtlpriv, rtlpriv->cfg->maps[EFUSE_CTRL], value);
@@ -252,8 +252,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
 
         if ((_offset + _size_byte) > rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("read_efuse(): Invalid offset(%#x) with read "
-                          "bytes(%#x)!!\n", _offset, _size_byte));
+                         "read_efuse(): Invalid offset(%#x) with read bytes(%#x)!!\n",
+                         _offset, _size_byte);
                 return;
         }
 
@@ -280,7 +280,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         if (*rtemp8 != 0xFF) {
                 efuse_utilized++;
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                        ("Addr=%d\n", efuse_addr));
+                        "Addr=%d\n", efuse_addr);
                 efuse_addr++;
         }
 
@@ -290,13 +290,13 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                 if (offset < efuse_max_section) {
                         wren = (*rtemp8 & 0x0f);
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                                ("offset-%d Worden=%x\n", offset, wren));
+                                "offset-%d Worden=%x\n", offset, wren);
 
                         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
                                 if (!(wren & 0x01)) {
                                         RTPRINT(rtlpriv, FEEPROM,
-                                                EFUSE_READ_ALL, ("Addr=%d\n",
-                                                                 efuse_addr));
+                                                EFUSE_READ_ALL,
+                                                "Addr=%d\n", efuse_addr);
 
                                         read_efuse_byte(hw, efuse_addr, rtemp8);
                                         efuse_addr++;
@@ -308,8 +308,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                                                 break;
 
                                         RTPRINT(rtlpriv, FEEPROM,
-                                                EFUSE_READ_ALL, ("Addr=%d\n",
-                                                                 efuse_addr));
+                                                EFUSE_READ_ALL,
+                                                "Addr=%d\n", efuse_addr);
 
                                         read_efuse_byte(hw, efuse_addr, rtemp8);
                                         efuse_addr++;
@@ -326,7 +326,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
                 }
 
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
-                        ("Addr=%d\n", efuse_addr));
+                        "Addr=%d\n", efuse_addr);
                 read_efuse_byte(hw, efuse_addr, rtemp8);
                 if (*rtemp8 != 0xFF && (efuse_addr < efuse_len)) {
                         efuse_utilized++;
@@ -395,9 +395,8 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
                 result = false;
 
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("efuse_shadow_update_chk(): totalbytes(%#x), "
-                  "hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",
-                  totalbytes, hdr_num, words_need, efuse_used));
+                 "efuse_shadow_update_chk(): totalbytes(%#x), hdr_num(%#x), words_need(%#x), efuse_used(%d)\n",
+                 totalbytes, hdr_num, words_need, efuse_used);
 
         return result;
 }
@@ -434,7 +433,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
         u8 word_en = 0x0F;
         u8 first_pg = false;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, ("--->\n"));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "--->\n");
 
         if (!efuse_shadow_update_chk(hw)) {
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
@@ -443,7 +442,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("<---efuse out of capacity!!\n"));
+                         "<---efuse out of capacity!!\n");
                 return false;
         }
         efuse_power_switch(hw, true, true);
@@ -478,12 +477,12 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                                &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],
                                8);
                         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,
-                                      ("U-efuse\n"), tmpdata, 8);
+                                      "U-efuse", tmpdata, 8);
 
                         if (!efuse_pg_packet_write(hw, (u8) offset, word_en,
                                                    tmpdata)) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("PG section(%#x) fail!!\n", offset));
+                                         "PG section(%#x) fail!!\n", offset);
                                 break;
                         }
                 }
@@ -497,7 +496,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "<---\n");
         return true;
 }
 
@@ -634,8 +633,8 @@ static int efuse_one_byte_write(struct ieee80211_hw *hw, u16 addr, u8 data)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmpidx = 0;
 
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("Addr = %x Data=%x\n", addr, data));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "Addr = %x Data=%x\n",
+                 addr, data);
 
         rtl_write_byte(rtlpriv,
                        rtlpriv->cfg->maps[EFUSE_CTRL] + 1, (u8) (addr & 0xff));
@@ -851,7 +850,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                         }
                 }
         }
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse PG_STATE_HEADER-1\n"));
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse PG_STATE_HEADER-1\n");
 }
 
 static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
@@ -916,7 +915,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
                 }
 
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                        ("efuse PG_STATE_HEADER-2\n"));
+                        "efuse PG_STATE_HEADER-2\n");
         }
 }
 
@@ -936,7 +935,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         if (efuse_get_current_size(hw) >=
             (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                        ("efuse_pg_packet_write error\n"));
+                        "efuse_pg_packet_write error\n");
                 return false;
         }
 
@@ -948,7 +947,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         efuse_word_enable_data_read(word_en, data, target_pkt.data);
         target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);
 
-        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse Power ON\n"));
+        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,  "efuse Power ON\n");
 
         while (continual && (efuse_addr <
                (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
@@ -956,7 +955,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                 if (write_state == PG_STATE_HEADER) {
                         badworden = 0x0F;
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                ("efuse PG_STATE_HEADER\n"));
+                                "efuse PG_STATE_HEADER\n");
 
                         if (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
                             (efuse_data != 0xFF))
@@ -976,7 +975,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
 
                 } else if (write_state == PG_STATE_DATA) {
                         RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                ("efuse PG_STATE_DATA\n"));
+                                "efuse PG_STATE_DATA\n");
                         badworden =
                             efuse_word_enable_data_write(hw, efuse_addr + 1,
                                                          target_pkt.word_en,
@@ -999,14 +998,14 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
                                         result = false;
                                 }
                                 RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
-                                        ("efuse PG_STATE_HEADER-3\n"));
+                                        "efuse PG_STATE_HEADER-3\n");
                         }
                 }
         }
 
         if (efuse_addr >= (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                         ("efuse_addr(%#x) Out of size!!\n", efuse_addr));
+                         "efuse_addr(%#x) Out of size!!\n", efuse_addr);
         }
 
         return true;
@@ -1046,8 +1045,8 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
         u8 tmpdata[8];
 
         memset(tmpdata, 0xff, PGPKT_DATA_SIZE);
-        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
-                 ("word_en = %x efuse_addr=%x\n", word_en, efuse_addr));
+        RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, "word_en = %x efuse_addr=%x\n",
+                 word_en, efuse_addr);
 
         if (!(word_en & BIT(0))) {
                 tmpaddr = start_addr;
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
index 164dabaa7615..2bdea9a8699e 100644
--- a/drivers/net/wireless/rtlwifi/efuse.h
+++ b/drivers/net/wireless/rtlwifi/efuse.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 39e0907a3c4e..5cb2199435d2 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.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,13 +27,13 @@
  *
  *****************************************************************************/
 
-#include <linux/export.h>
-#include "core.h"
 #include "wifi.h"
+#include "core.h"
 #include "pci.h"
 #include "base.h"
 #include "ps.h"
 #include "efuse.h"
+#include <linux/export.h>
 
 static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
         PCI_VENDOR_ID_INTEL,
@@ -170,7 +170,7 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -232,7 +232,7 @@ static void rtl_pci_disable_aspm(struct ieee80211_hw *hw)
 
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("PCI(Bridge) UNKNOWN.\n"));
+                         "PCI(Bridge) UNKNOWN\n");
 
                 return;
         }
@@ -286,7 +286,7 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
 
         if (pcibridge_vendor == PCI_BRIDGE_VENDOR_UNKNOWN) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("PCI(Bridge) UNKNOWN.\n"));
+                         "PCI(Bridge) UNKNOWN\n");
                 return;
         }
 
@@ -303,11 +303,10 @@ static void rtl_pci_enable_aspm(struct ieee80211_hw *hw)
                               u_pcibridge_aspmsetting);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PlatformEnableASPM():PciBridge busnumber[%x], "
-                  "DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n",
-                  pcibridge_busnum, pcibridge_devnum, pcibridge_funcnum,
-                  (pcipriv->ndis_adapter.pcibridge_pciehdr_offset + 0x10),
-                  u_pcibridge_aspmsetting));
+                 "PlatformEnableASPM():PciBridge busnumber[%x], DevNumbe[%x], funcnumber[%x], Write reg[%x] = %x\n",
+                 pcibridge_busnum, pcibridge_devnum, pcibridge_funcnum,
+                 (pcipriv->ndis_adapter.pcibridge_pciehdr_offset + 0x10),
+                 u_pcibridge_aspmsetting);
 
         udelay(50);
 
@@ -382,9 +381,8 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev,
         pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg);
         pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Link Control Register =%x\n",
-                  pcipriv->ndis_adapter.linkctrl_reg));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Link Control Register =%x\n",
+                 pcipriv->ndis_adapter.linkctrl_reg);
 
         pci_read_config_byte(pdev, 0x98, &tmp);
         tmp |= BIT(4);
@@ -551,11 +549,10 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                         skb_pull(skb, EM_HDR_LEN);
 
                 RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE,
-                         ("new ring->idx:%d, "
-                          "free: skb_queue_len:%d, free: seq:%x\n",
-                          ring->idx,
-                          skb_queue_len(&ring->queue),
-                          *(u16 *) (skb->data + 22)));
+                         "new ring->idx:%d, free: skb_queue_len:%d, free: seq:%x\n",
+                         ring->idx,
+                         skb_queue_len(&ring->queue),
+                         *(u16 *) (skb->data + 22));
 
                 if (prio == TXCMD_QUEUE) {
                         dev_kfree_skb(skb);
@@ -593,11 +590,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
                                 == 2) {
 
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                                        ("more desc left, wake"
-                                         "skb_queue@%d,ring->idx = %d,"
-                                         "skb_queue_len = 0x%d\n",
-                                         prio, ring->idx,
-                                         skb_queue_len(&ring->queue)));
+                                 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n",
+                                 prio, ring->idx,
+                                 skb_queue_len(&ring->queue));
 
                         ieee80211_wake_queue(hw,
                                         skb_get_queue_mapping
@@ -657,6 +652,8 @@ static void _rtl_receive_one(struct ieee80211_hw *hw, struct sk_buff *skb,
                 return;
 
         uskb = dev_alloc_skb(skb->len + 128);
+        if (!uskb)
+                return;         /* exit if allocation failed */
         memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status, sizeof(rx_status));
         pdata = (u8 *)skb_put(uskb, skb->len);
         memcpy(pdata, skb->data, skb->len);
@@ -709,9 +706,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 
                 new_skb = dev_alloc_skb(rtlpci->rxbuffersize);
                 if (unlikely(!new_skb)) {
-                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV),
-                                 DBG_DMESG,
-                                 ("can't alloc skb for rx\n"));
+                        RT_TRACE(rtlpriv, (COMP_INTR | COMP_RECV), DBG_DMESG,
+                                 "can't alloc skb for rx\n");
                         goto done;
                 }
 
@@ -796,38 +792,37 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
         /*<1> beacon related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_TBDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon ok interrupt!\n"));
+                         "beacon ok interrupt!\n");
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_TBDER])) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon err interrupt!\n"));
+                         "beacon err interrupt!\n");
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_BDOK]) {
-                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("beacon interrupt!\n"));
+                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "beacon interrupt!\n");
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_BcnInt]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("prepare beacon for interrupt!\n"));
+                         "prepare beacon for interrupt!\n");
                 tasklet_schedule(&rtlpriv->works.irq_prepare_bcn_tasklet);
         }
 
         /*<3> Tx related */
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_TXFOVW]))
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("IMR_TXFOVW!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "IMR_TXFOVW!\n");
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_MGNTDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("Manage ok interrupt!\n"));
+                         "Manage ok interrupt!\n");
                 _rtl_pci_tx_isr(hw, MGNT_QUEUE);
         }
 
         if (inta & rtlpriv->cfg->maps[RTL_IMR_HIGHDOK]) {
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("HIGH_QUEUE ok interrupt!\n"));
+                         "HIGH_QUEUE ok interrupt!\n");
                 _rtl_pci_tx_isr(hw, HIGH_QUEUE);
         }
 
@@ -835,7 +830,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("BK Tx OK interrupt!\n"));
+                         "BK Tx OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, BK_QUEUE);
         }
 
@@ -843,7 +838,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("BE TX OK interrupt!\n"));
+                         "BE TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, BE_QUEUE);
         }
 
@@ -851,7 +846,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("VI TX OK interrupt!\n"));
+                         "VI TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, VI_QUEUE);
         }
 
@@ -859,7 +854,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                 rtlpriv->link_info.num_tx_inperiod++;
 
                 RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                         ("Vo TX OK interrupt!\n"));
+                         "Vo TX OK interrupt!\n");
                 _rtl_pci_tx_isr(hw, VO_QUEUE);
         }
 
@@ -868,25 +863,25 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
                         rtlpriv->link_info.num_tx_inperiod++;
 
                         RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,
-                                        ("CMD TX OK interrupt!\n"));
+                                 "CMD TX OK interrupt!\n");
                         _rtl_pci_tx_isr(hw, TXCMD_QUEUE);
                 }
         }
 
         /*<2> Rx related */
         if (inta & rtlpriv->cfg->maps[RTL_IMR_ROK]) {
-                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, ("Rx ok interrupt!\n"));
+                RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "Rx ok interrupt!\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_RDU])) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("rx descriptor unavailable!\n"));
+                         "rx descriptor unavailable!\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
         if (unlikely(inta & rtlpriv->cfg->maps[RTL_IMR_RXFOVW])) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("rx overflow !\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, "rx overflow !\n");
                 _rtl_pci_rx_interrupt(hw);
         }
 
@@ -1028,7 +1023,7 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
 
         if (!ring || (unsigned long)ring & 0xFF) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Cannot allocate TX ring (prio = %d)\n", prio));
+                         "Cannot allocate TX ring (prio = %d)\n", prio);
                 return -ENOMEM;
         }
 
@@ -1039,8 +1034,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw,
         rtlpci->tx_ring[prio].entries = entries;
         skb_queue_head_init(&rtlpci->tx_ring[prio].queue);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("queue:%d, ring_addr:%p\n", prio, ring));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "queue:%d, ring_addr:%p\n",
+                 prio, ring);
 
         for (i = 0; i < entries; i++) {
                 nextdescaddress = (u32) dma +
@@ -1078,7 +1073,7 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                 if (!rtlpci->rx_ring[rx_queue_idx].desc ||
                     (unsigned long)rtlpci->rx_ring[rx_queue_idx].desc & 0xFF) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Cannot allocate RX ring\n"));
+                                 "Cannot allocate RX ring\n");
                         return -ENOMEM;
                 }
 
@@ -1355,7 +1350,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         u8 temp_one = 1;
 
         if (ieee80211_is_auth(fc)) {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
                 rtl_ips_nic_on(hw);
         }
 
@@ -1388,10 +1383,9 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 
         if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("No more TX desc@%d, ring->idx = %d,"
-                          "idx = %d, skb_queue_len = 0x%d\n",
-                          hw_queue, ring->idx, idx,
-                          skb_queue_len(&ring->queue)));
+                         "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+                         hw_queue, ring->idx, idx,
+                         skb_queue_len(&ring->queue));
 
                 spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
                 return skb->len;
@@ -1426,11 +1420,9 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
             hw_queue != BEACON_QUEUE) {
 
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-                         ("less desc left, stop skb_queue@%d, "
-                          "ring->idx = %d,"
-                          "idx = %d, skb_queue_len = 0x%d\n",
-                          hw_queue, ring->idx, idx,
-                          skb_queue_len(&ring->queue)));
+                         "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+                         hw_queue, ring->idx, idx,
+                         skb_queue_len(&ring->queue));
 
                 ieee80211_stop_queue(hw, skb_get_queue_mapping(skb));
         }
@@ -1497,7 +1489,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
         err = _rtl_pci_init_trx_ring(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("tx ring initialization failed"));
+                         "tx ring initialization failed\n");
                 return err;
         }
 
@@ -1519,12 +1511,12 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
         err = rtlpriv->cfg->ops->hw_init(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Failed to config hardware!\n"));
+                         "Failed to config hardware!\n");
                 return err;
         }
 
         rtlpriv->cfg->ops->enable_interrupt(hw);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("enable_interrupt OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "enable_interrupt OK\n");
 
         rtl_init_rx_config(hw);
 
@@ -1535,7 +1527,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
 
         rtlpci->up_first_time = false;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
         return 0;
 }
 
@@ -1573,6 +1565,9 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
 
         rtlpci->driver_is_goingto_unload = true;
         rtlpriv->cfg->ops->hw_disable(hw);
+        /* some things are not needed if firmware not available */
+        if (!rtlpriv->max_fw_size)
+                return;
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
@@ -1622,20 +1617,20 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                 switch (revisionid) {
                 case RTL_PCI_REVISION_ID_8192PCIE:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("8192 PCI-E is found - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "8192 PCI-E is found - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192E;
                         break;
                 case RTL_PCI_REVISION_ID_8192SE:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("8192SE is found - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "8192SE is found - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192SE;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                 ("Err: Unknown device - "
-                                  "vid/did=%x/%x\n", venderid, deviceid));
+                                 "Err: Unknown device - vid/did=%x/%x\n",
+                                 venderid, deviceid);
                         rtlhal->hw_type = HARDWARE_TYPE_RTL8192SE;
                         break;
 
@@ -1646,18 +1641,18 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                    deviceid == RTL_PCI_8188CE_DID) {
                 rtlhal->hw_type = HARDWARE_TYPE_RTL8192CE;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("8192C PCI-E is found - "
-                          "vid/did=%x/%x\n", venderid, deviceid));
+                         "8192C PCI-E is found - vid/did=%x/%x\n",
+                         venderid, deviceid);
         } else if (deviceid == RTL_PCI_8192DE_DID ||
                    deviceid == RTL_PCI_8192DE_DID2) {
                 rtlhal->hw_type = HARDWARE_TYPE_RTL8192DE;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("8192D PCI-E is found - "
-                          "vid/did=%x/%x\n", venderid, deviceid));
+                         "8192D PCI-E is found - vid/did=%x/%x\n",
+                         venderid, deviceid);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Err: Unknown device -"
-                          " vid/did=%x/%x\n", venderid, deviceid));
+                         "Err: Unknown device - vid/did=%x/%x\n",
+                         venderid, deviceid);
 
                 rtlhal->hw_type = RTL_DEFAULT_HARDWARE_TYPE;
         }
@@ -1665,19 +1660,18 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192DE) {
                 if (revisionid == 0 || revisionid == 1) {
                         if (revisionid == 0) {
-                                RT_TRACE(rtlpriv, COMP_INIT,
-                                         DBG_LOUD, ("Find 92DE MAC0.\n"));
+                                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                                         "Find 92DE MAC0\n");
                                 rtlhal->interfaceindex = 0;
                         } else if (revisionid == 1) {
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                        ("Find 92DE MAC1.\n"));
+                                         "Find 92DE MAC1\n");
                                 rtlhal->interfaceindex = 1;
                         }
                 } else {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("Unknown device - "
-                                "VendorID/DeviceID=%x/%x, Revision=%x\n",
-                                venderid, deviceid, revisionid));
+                                 "Unknown device - VendorID/DeviceID=%x/%x, Revision=%x\n",
+                                 venderid, deviceid, revisionid);
                         rtlhal->interfaceindex = 0;
                 }
         }
@@ -1693,8 +1687,8 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
                         if (bridge_pdev->vendor == pcibridge_vendors[tmp]) {
                                 pcipriv->ndis_adapter.pcibridge_vendor = tmp;
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                         ("Pci Bridge Vendor is found index:"
-                                         " %d\n", tmp));
+                                         "Pci Bridge Vendor is found index: %d\n",
+                                         tmp);
                                 break;
                         }
                 }
@@ -1723,23 +1717,21 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("pcidev busnumber:devnumber:funcnumber:"
-                  "vendor:link_ctl %d:%d:%d:%x:%x\n",
-                  pcipriv->ndis_adapter.busnumber,
-                  pcipriv->ndis_adapter.devnumber,
-                  pcipriv->ndis_adapter.funcnumber,
-                  pdev->vendor, pcipriv->ndis_adapter.linkctrl_reg));
+                 "pcidev busnumber:devnumber:funcnumber:vendor:link_ctl %d:%d:%d:%x:%x\n",
+                 pcipriv->ndis_adapter.busnumber,
+                 pcipriv->ndis_adapter.devnumber,
+                 pcipriv->ndis_adapter.funcnumber,
+                 pdev->vendor, pcipriv->ndis_adapter.linkctrl_reg);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("pci_bridge busnumber:devnumber:funcnumber:vendor:"
-                  "pcie_cap:link_ctl_reg:amd %d:%d:%d:%x:%x:%x:%x\n",
-                  pcipriv->ndis_adapter.pcibridge_busnum,
-                  pcipriv->ndis_adapter.pcibridge_devnum,
-                  pcipriv->ndis_adapter.pcibridge_funcnum,
-                  pcibridge_vendors[pcipriv->ndis_adapter.pcibridge_vendor],
-                  pcipriv->ndis_adapter.pcibridge_pciehdr_offset,
-                  pcipriv->ndis_adapter.pcibridge_linkctrlreg,
-                  pcipriv->ndis_adapter.amd_l1_patch));
+                 "pci_bridge busnumber:devnumber:funcnumber:vendor:pcie_cap:link_ctl_reg:amd %d:%d:%d:%x:%x:%x:%x\n",
+                 pcipriv->ndis_adapter.pcibridge_busnum,
+                 pcipriv->ndis_adapter.pcibridge_devnum,
+                 pcipriv->ndis_adapter.pcibridge_funcnum,
+                 pcibridge_vendors[pcipriv->ndis_adapter.pcibridge_vendor],
+                 pcipriv->ndis_adapter.pcibridge_pciehdr_offset,
+                 pcipriv->ndis_adapter.pcibridge_linkctrlreg,
+                 pcipriv->ndis_adapter.amd_l1_patch);
 
         rtl_pci_parse_configuration(pdev, hw);
 
@@ -1759,16 +1751,15 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 
         err = pci_enable_device(pdev);
         if (err) {
-                RT_ASSERT(false,
-                          ("%s : Cannot enable new PCI device\n",
-                           pci_name(pdev)));
+                RT_ASSERT(false, "%s : Cannot enable new PCI device\n",
+                          pci_name(pdev));
                 return err;
         }
 
         if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
-                        RT_ASSERT(false, ("Unable to obtain 32bit DMA "
-                                          "for consistent allocations\n"));
+                        RT_ASSERT(false,
+                                  "Unable to obtain 32bit DMA for consistent allocations\n");
                         pci_disable_device(pdev);
                         return -ENOMEM;
                 }
@@ -1780,7 +1771,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                                 sizeof(struct rtl_priv), &rtl_ops);
         if (!hw) {
                 RT_ASSERT(false,
-                          ("%s : ieee80211 alloc failed\n", pci_name(pdev)));
+                          "%s : ieee80211 alloc failed\n", pci_name(pdev));
                 err = -ENOMEM;
                 goto fail1;
         }
@@ -1791,6 +1782,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv = hw->priv;
         pcipriv = (void *)rtlpriv->priv;
         pcipriv->dev.pdev = pdev;
+        init_completion(&rtlpriv->firmware_loading_complete);
 
         /* init cfg & intf_ops */
         rtlpriv->rtlhal.interface = INTF_PCI;
@@ -1810,8 +1802,8 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         /* MEM map */
         err = pci_request_regions(pdev, KBUILD_MODNAME);
         if (err) {
-                RT_ASSERT(false, ("Can't obtain PCI resources\n"));
-                return err;
+                RT_ASSERT(false, "Can't obtain PCI resources\n");
+                goto fail2;
         }
 
         pmem_start = pci_resource_start(pdev, rtlpriv->cfg->bar_id);
@@ -1823,15 +1815,14 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                         (unsigned long)pci_iomap(pdev,
                         rtlpriv->cfg->bar_id, pmem_len);
         if (rtlpriv->io.pci_mem_start == 0) {
-                RT_ASSERT(false, ("Can't map PCI mem\n"));
+                RT_ASSERT(false, "Can't map PCI mem\n");
                 goto fail2;
         }
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("mem mapped space: start: 0x%08lx len:%08lx "
-                  "flags:%08lx, after map:0x%08lx\n",
-                  pmem_start, pmem_len, pmem_flags,
-                  rtlpriv->io.pci_mem_start));
+                 "mem mapped space: start: 0x%08lx len:%08lx flags:%08lx, after map:0x%08lx\n",
+                 pmem_start, pmem_len, pmem_flags,
+                 rtlpriv->io.pci_mem_start);
 
         /* Disable Clk Request */
         pci_write_config_byte(pdev, 0x81, 0);
@@ -1851,8 +1842,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv->cfg->ops->read_eeprom_info(hw);
 
         if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't init_sw_vars.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
                 goto fail3;
         }
 
@@ -1865,63 +1855,48 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         err = rtl_init_core(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate sw for mac80211.\n"));
+                         "Can't allocate sw for mac80211\n");
                 goto fail3;
         }
 
         /* Init PCI sw */
         err = !rtl_pci_init(hw, pdev);
         if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to init PCI.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Failed to init PCI\n");
                 goto fail3;
         }
 
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't register mac80211 hw.\n"));
-                goto fail3;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("failed to create sysfs device attributes\n"));
+                         "failed to create sysfs device attributes\n");
                 goto fail3;
         }
 
-        /*init rfkill */
-        rtl_init_rfkill(hw);
-
         rtlpci = rtl_pcidev(pcipriv);
         err = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt,
                           IRQF_SHARED, KBUILD_MODNAME, hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("%s: failed to register IRQ handler\n",
-                          wiphy_name(hw->wiphy)));
+                         "%s: failed to register IRQ handler\n",
+                         wiphy_name(hw->wiphy));
                 goto fail3;
-        } else {
-                rtlpci->irq_alloc = 1;
         }
+        rtlpci->irq_alloc = 1;
 
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 
 fail3:
         pci_set_drvdata(pdev, NULL);
         rtl_deinit_core(hw);
         _rtl_pci_io_handler_release(hw);
-        ieee80211_free_hw(hw);
 
         if (rtlpriv->io.pci_mem_start != 0)
                 pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 
 fail2:
         pci_release_regions(pdev);
+        complete(&rtlpriv->firmware_loading_complete);
 
 fail1:
 
@@ -1940,6 +1915,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
         struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
         struct rtl_mac *rtlmac = rtl_mac(rtlpriv);
 
+        /* just in case driver is removed before firmware callback */
+        wait_for_completion(&rtlpriv->firmware_loading_complete);
         clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
 
         sysfs_remove_group(&pdev->dev.kobj, &rtl_attribute_group);
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index ebe0b42c0518..241448fc9ed5 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -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
@@ -239,7 +239,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
 void rtl_pci_disconnect(struct pci_dev *pdev);
 int rtl_pci_suspend(struct device *dev);
 int rtl_pci_resume(struct device *dev);
-
 static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)
 {
         return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 130fdd99d573..15f86eaa1cd6 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.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
@@ -44,10 +44,11 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw)
 
         if (is_hal_stop(rtlhal))
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Driver is already down!\n"));
+                         "Driver is already down!\n");
 
         /*<2> Enable Adapter */
-        rtlpriv->cfg->ops->hw_init(hw);
+        if (rtlpriv->cfg->ops->hw_init(hw))
+                return 1;
         RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
 
         /*<3> Enable Interrupt */
@@ -120,7 +121,7 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,
 
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -176,7 +177,7 @@ void rtl_ips_nic_off_wq_callback(void *data)
 
         if (mac->opmode != NL80211_IFTYPE_STATION) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("not station return\n"));
+                         "not station return\n");
                 return;
         }
 
@@ -207,7 +208,7 @@ void rtl_ips_nic_off_wq_callback(void *data)
                     (mac->link_state == MAC80211_NOLINK) &&
                     !mac->act_scanning) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                 ("IPSEnter(): Turn off RF.\n"));
+                                 "IPSEnter(): Turn off RF\n");
 
                         ppsc->inactive_pwrstate = ERFOFF;
                         ppsc->in_powersavemode = true;
@@ -280,8 +281,7 @@ static bool rtl_get_fwlps_doze(struct ieee80211_hw *hw)
 
         if (ps_timediff < 2000) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Delay enter Fw LPS for DHCP, ARP,"
-                          " or EAPOL exchanging state.\n"));
+                         "Delay enter Fw LPS for DHCP, ARP, or EAPOL exchanging state\n");
                 return false;
         }
 
@@ -328,8 +328,8 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                 bool fw_current_inps;
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("FW LPS leave ps_mode:%x\n",
-                                  FW_PS_ACTIVE_MODE));
+                                 "FW LPS leave ps_mode:%x\n",
+                                 FW_PS_ACTIVE_MODE);
 
                         rpwm_val = 0x0C;        /* RF on */
                         fw_pwrmode = FW_PS_ACTIVE_MODE;
@@ -347,8 +347,8 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                 } else {
                         if (rtl_get_fwlps_doze(hw)) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                ("FW LPS enter ps_mode:%x\n",
-                                                 ppsc->fwctrl_psmode));
+                                         "FW LPS enter ps_mode:%x\n",
+                                         ppsc->fwctrl_psmode);
 
                                 rpwm_val = 0x02;        /* RF off */
                                 fw_current_inps = true;
@@ -402,7 +402,7 @@ void rtl_lps_enter(struct ieee80211_hw *hw)
         if (mac->cnt_after_linked >= 2) {
                 if (ppsc->dot11_psmode == EACTIVE) {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                        ("Enter 802.11 power save mode...\n"));
+                                 "Enter 802.11 power save mode...\n");
 
                         rtl_lps_set_psmode(hw, EAUTOPS);
                 }
@@ -434,7 +434,7 @@ void rtl_lps_leave(struct ieee80211_hw *hw)
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Busy Traffic,Leave 802.11 power save..\n"));
+                                 "Busy Traffic,Leave 802.11 power save..\n");
 
                         rtl_lps_set_psmode(hw, EACTIVE);
                 }
@@ -518,8 +518,8 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
                 queue_delayed_work(rtlpriv->works.rtl_wq,
                                 &rtlpriv->works.ps_work, MSECS(5));
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, ("u_bufferd: %x, "
-                                "m_buffered: %x\n", u_buffed, m_buffed));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed);
         }
 }
 
@@ -607,8 +607,8 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw)
          * sleep  = dtim_period, that meaons, we should
          * awake before every dtim */
         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                 ("dtim_counter:%x will sleep :%d"
-                 " beacon_intv\n", rtlpriv->psc.dtim_counter, sleep_intv));
+                 "dtim_counter:%x will sleep :%d beacon_intv\n",
+                 rtlpriv->psc.dtim_counter, sleep_intv);
 
         /* we tested that 40ms is enough for sw & hw sw delay */
         queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_rfon_wq,
diff --git a/drivers/net/wireless/rtlwifi/ps.h b/drivers/net/wireless/rtlwifi/ps.h
index 84628e6041c7..1357856998c2 100644
--- a/drivers/net/wireless/rtlwifi/ps.h
+++ b/drivers/net/wireless/rtlwifi/ps.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rc.c b/drivers/net/wireless/rtlwifi/rc.c
index 539df66dce0a..c66f08a0524a 100644
--- a/drivers/net/wireless/rtlwifi/rc.c
+++ b/drivers/net/wireless/rtlwifi/rc.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
@@ -251,7 +251,7 @@ static void *rtl_rate_alloc_sta(void *ppriv,
         rate_priv = kzalloc(sizeof(struct rtl_rate_priv), gfp);
         if (!rate_priv) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Unable to allocate private rc structure\n"));
+                         "Unable to allocate private rc structure\n");
                 return NULL;
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rc.h b/drivers/net/wireless/rtlwifi/rc.h
index 4afa2c20adcf..4d6176160610 100644
--- a/drivers/net/wireless/rtlwifi/rc.h
+++ b/drivers/net/wireless/rtlwifi/rc.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index 9fedb1f70919..c1608cddc529 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.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
@@ -398,13 +398,11 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan;
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
-                 (KERN_DEBUG "rtl: EEPROM regdomain: 0x%0x\n",
-                  rtlpriv->regd.country_code));
+                 "rtl: EEPROM regdomain: 0x%0x\n", rtlpriv->regd.country_code);
 
         if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) {
                 RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG,
-                         (KERN_DEBUG "rtl: EEPROM indicates invalid contry code"
-                          "world wide 13 should be used\n"));
+                         "rtl: EEPROM indicates invalid contry code, world wide 13 should be used\n");
 
                 rtlpriv->regd.country_code = COUNTRY_CODE_WORLD_WIDE_13;
         }
@@ -420,8 +418,8 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         }
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE,
-                 (KERN_DEBUG "rtl: Country alpha2 being used: %c%c\n",
-                  rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]));
+                 "rtl: Country alpha2 being used: %c%c\n",
+                 rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]);
 
         _rtl_regd_init_wiphy(&rtlpriv->regd, wiphy, reg_notifier);
 
@@ -433,7 +431,7 @@ int rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, "\n");
 
         return _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd);
 }
diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h
index d23118938fac..70ef2f418a44 100644
--- a/drivers/net/wireless/rtlwifi/regd.h
+++ b/drivers/net/wireless/rtlwifi/regd.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 72a98cab6f69..cb5535cf3ae2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.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
@@ -246,16 +246,15 @@ static void rtl92c_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("cnt_parity_fail = %d, cnt_rate_illegal = %d, "
-                  "cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
-                  falsealm_cnt->cnt_parity_fail,
-                  falsealm_cnt->cnt_rate_illegal,
-                  falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail));
+                 "cnt_parity_fail = %d, cnt_rate_illegal = %d, cnt_crc8_fail = %d, cnt_mcs_fail = %d\n",
+                 falsealm_cnt->cnt_parity_fail,
+                 falsealm_cnt->cnt_rate_illegal,
+                 falsealm_cnt->cnt_crc8_fail, falsealm_cnt->cnt_mcs_fail);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
-                  falsealm_cnt->cnt_ofdm_fail,
-                  falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all));
+                 "cnt_ofdm_fail = %x, cnt_cck_fail = %x, cnt_all = %x\n",
+                 falsealm_cnt->cnt_ofdm_fail,
+                 falsealm_cnt->cnt_cck_fail, falsealm_cnt->cnt_all);
 }
 
 static void rtl92c_dm_ctrl_initgain_by_fa(struct ieee80211_hw *hw)
@@ -313,8 +312,8 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw)
                     dm_digtable.backoff_val;
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("rssi_val_min = %x backoff_val %x\n",
-                  dm_digtable.rssi_val_min, dm_digtable.backoff_val));
+                 "rssi_val_min = %x backoff_val %x\n",
+                 dm_digtable.rssi_val_min, dm_digtable.backoff_val);
 
         rtl92c_dm_write_dig(hw);
 }
@@ -364,10 +363,9 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
         }
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("curmultista_connectstate = "
-                  "%x dig_ext_port_stage %x\n",
-                  dm_digtable.curmultista_connectstate,
-                  dm_digtable.dig_ext_port_stage));
+                 "curmultista_connectstate = %x dig_ext_port_stage %x\n",
+                 dm_digtable.curmultista_connectstate,
+                 dm_digtable.dig_ext_port_stage);
 }
 
 static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw)
@@ -375,10 +373,9 @@ static void rtl92c_dm_initial_gain_sta(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("presta_connectstate = %x,"
-                  " cursta_connectctate = %x\n",
-                  dm_digtable.presta_connectstate,
-                  dm_digtable.cursta_connectctate));
+                 "presta_connectstate = %x, cursta_connectctate = %x\n",
+                 dm_digtable.presta_connectstate,
+                 dm_digtable.cursta_connectctate);
 
         if (dm_digtable.presta_connectstate == dm_digtable.cursta_connectctate
             || dm_digtable.cursta_connectctate == DIG_STA_BEFORE_CONNECT
@@ -464,11 +461,11 @@ static void rtl92c_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                 dm_digtable.pre_cck_pd_state = dm_digtable.cur_cck_pd_state;
         }
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("CCKPDStage=%x\n", dm_digtable.cur_cck_pd_state));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "CCKPDStage=%x\n",
+                 dm_digtable.cur_cck_pd_state);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE,
-                 ("is92C=%x\n", IS_92C_SERIAL(rtlhal->version)));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_TRACE, "is92C=%x\n",
+                 IS_92C_SERIAL(rtlhal->version));
 }
 
 static void rtl92c_dm_ctrl_initgain_by_twoport(struct ieee80211_hw *hw)
@@ -519,10 +516,9 @@ void rtl92c_dm_write_dig(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("cur_igvalue = 0x%x, "
-                  "pre_igvalue = 0x%x, backoff_val = %d\n",
-                  dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
-                  dm_digtable.backoff_val));
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
+                 dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
+                 dm_digtable.backoff_val);
 
         if (dm_digtable.pre_igvalue != dm_digtable.cur_igvalue) {
                 rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
@@ -676,15 +672,14 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
         rtlpriv->dm.txpower_trackinginit = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("rtl92c_dm_txpower_tracking_callback_thermalmeter\n"));
+                 "rtl92c_dm_txpower_tracking_callback_thermalmeter\n");
 
         thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                  "eeprom_thermalmeter 0x%x\n",
-                  thermalvalue, rtlpriv->dm.thermalvalue,
-                  rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
+                 thermalvalue, rtlpriv->dm.thermalvalue,
+                 rtlefuse->eeprom_thermalmeter);
 
         rtl92c_phy_ap_calibrate(hw, (thermalvalue -
                                      rtlefuse->eeprom_thermalmeter));
@@ -702,10 +697,9 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                 ofdm_index_old[0] = (u8) i;
 
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                        ("Initial pathA ele_d reg0x%x = 0x%lx, "
-                                         "ofdm_index=0x%x\n",
+                                         "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
                                          ROFDM0_XATXIQIMBALANCE,
-                                         ele_d, ofdm_index_old[0]));
+                                         ele_d, ofdm_index_old[0]);
                                 break;
                         }
                 }
@@ -719,11 +713,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                     MASKOFDM_D)) {
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
-                                           DBG_LOUD,
-                                           ("Initial pathB ele_d reg0x%x = "
-                                           "0x%lx, ofdm_index=0x%x\n",
-                                           ROFDM0_XBTXIQIMBALANCE, ele_d,
-                                           ofdm_index_old[1]));
+                                                 DBG_LOUD,
+                                                 "Initial pathB ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
+                                                 ROFDM0_XBTXIQIMBALANCE, ele_d,
+                                                 ofdm_index_old[1]);
                                         break;
                                 }
                         }
@@ -741,11 +734,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial reg0x%x = 0x%lx, "
-                                                  "cck_index=0x%x, ch 14 %d\n",
-                                                  RCCK0_TXFILTER2, temp_cck,
-                                                  cck_index_old,
-                                                  rtlpriv->dm.cck_inch14));
+                                                 "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch 14 %d\n",
+                                                 RCCK0_TXFILTER2, temp_cck,
+                                                 cck_index_old,
+                                                 rtlpriv->dm.cck_inch14);
                                         break;
                                 }
                         } else {
@@ -757,11 +749,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial reg0x%x = 0x%lx, "
-                                                  "cck_index=0x%x, ch14 %d\n",
-                                                  RCCK0_TXFILTER2, temp_cck,
-                                                  cck_index_old,
-                                                  rtlpriv->dm.cck_inch14));
+                                                 "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch14 %d\n",
+                                                 RCCK0_TXFILTER2, temp_cck,
+                                                 cck_index_old,
+                                                 rtlpriv->dm.cck_inch14);
                                         break;
                                 }
                         }
@@ -790,12 +781,10 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                     (rtlpriv->dm.thermalvalue_iqk - thermalvalue);
 
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                        ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                         "eeprom_thermalmeter 0x%x delta 0x%x "
-                         "delta_lck 0x%x delta_iqk 0x%x\n",
+                         "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
                          thermalvalue, rtlpriv->dm.thermalvalue,
                          rtlefuse->eeprom_thermalmeter, delta, delta_lck,
-                         delta_iqk));
+                         delta_iqk);
 
                 if (delta_lck > 1) {
                         rtlpriv->dm.thermalvalue_lck = thermalvalue;
@@ -815,18 +804,15 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x, "
-                                          "OFDM_B_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.ofdm_index[1],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, OFDM_B_index=0x%x, cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.ofdm_index[1],
+                                         rtlpriv->dm.cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.cck_index);
                         }
 
                         if (thermalvalue > rtlefuse->eeprom_thermalmeter) {
@@ -918,16 +904,13 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
 
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x, "
-                                          "OFDM_B_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          ofdm_index[0], ofdm_index[1],
-                                          cck_index));
+                                         "new OFDM_A_index=0x%x, OFDM_B_index=0x%x, cck_index=0x%x\n",
+                                         ofdm_index[0], ofdm_index[1],
+                                         cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x,"
-                                          "cck_index=0x%x\n",
-                                          ofdm_index[0], cck_index));
+                                         "new OFDM_A_index=0x%x, cck_index=0x%x\n",
+                                         ofdm_index[0], cck_index);
                         }
                 }
 
@@ -1085,7 +1068,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                         rtlpriv->dm.thermalvalue = thermalvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===\n");
 
 }
 
@@ -1098,8 +1081,8 @@ static void rtl92c_dm_initialize_txpower_tracking_thermalmeter(
         rtlpriv->dm.txpower_trackinginit = false;
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("pMgntInfo->txpower_tracking = %d\n",
-                  rtlpriv->dm.txpower_tracking));
+                 "pMgntInfo->txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking);
 }
 
 static void rtl92c_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1125,12 +1108,12 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter(
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, RFREG_OFFSET_MASK,
                               0x60);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Trigger 92S Thermal Meter!!\n"));
+                         "Trigger 92S Thermal Meter!!\n");
                 tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Schedule TxPowerTracking direct call!!\n"));
+                         "Schedule TxPowerTracking direct call!!\n");
                 rtl92c_dm_txpower_tracking_directcall(hw);
                 tm_trigger = 0;
         }
@@ -1169,13 +1152,13 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
 
         if (is_hal_stop(rtlhal)) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                         ("<---- driver is going to unload\n"));
+                         "<---- driver is going to unload\n");
                 return;
         }
 
         if (!rtlpriv->dm.useramask) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                        ("<---- driver does not control rate adaptive mask\n"));
+                         "<---- driver does not control rate adaptive mask\n");
                 return;
         }
 
@@ -1210,14 +1193,13 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                         p_ra->ratr_state = DM_RATR_STA_LOW;
 
                 if (p_ra->pre_ratr_state != p_ra->ratr_state) {
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, "RSSI = %ld\n",
+                                 rtlpriv->dm.undecorated_smoothed_pwdb);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("RSSI = %ld\n",
-                                  rtlpriv->dm.undecorated_smoothed_pwdb));
+                                 "RSSI_LEVEL = %d\n", p_ra->ratr_state);
                         RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("RSSI_LEVEL = %d\n", p_ra->ratr_state));
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
-                                 ("PreState = %d, CurState = %d\n",
-                                  p_ra->pre_ratr_state, p_ra->ratr_state));
+                                 "PreState = %d, CurState = %d\n",
+                                 p_ra->pre_ratr_state, p_ra->ratr_state);
 
                         rcu_read_lock();
                         sta = ieee80211_find_sta(mac->vif, mac->bssid);
@@ -1316,8 +1298,7 @@ static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
         if (((mac->link_state == MAC80211_NOLINK)) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 dm_pstable.rssi_val_min = 0;
-                RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                         ("Not connected to any\n"));
+                RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD, "Not connected to any\n");
         }
 
         if (mac->link_state == MAC80211_LINKED) {
@@ -1325,22 +1306,22 @@ static void rtl92c_dm_dynamic_bb_powersaving(struct ieee80211_hw *hw)
                         dm_pstable.rssi_val_min =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  dm_pstable.rssi_val_min));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 dm_pstable.rssi_val_min);
                 } else {
                         dm_pstable.rssi_val_min =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  dm_pstable.rssi_val_min));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 dm_pstable.rssi_val_min);
                 }
         } else {
                 dm_pstable.rssi_val_min =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, DBG_LOUD, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          dm_pstable.rssi_val_min));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         dm_pstable.rssi_val_min);
         }
 
         if (IS_92C_SERIAL(rtlhal->version))
@@ -1381,7 +1362,7 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -1394,28 +1375,28 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -1423,18 +1404,18 @@ void rtl92c_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
index b9736d3e9a39..2178e3761883 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 931d97979b04..c20b3c30f62e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.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,16 +27,13 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/firmware.h>
-#include <linux/export.h>
 #include "../wifi.h"
 #include "../pci.h"
 #include "../base.h"
 #include "../rtl8192ce/reg.h"
 #include "../rtl8192ce/def.h"
 #include "fw_common.h"
+#include <linux/export.h>
 
 static void _rtl92c_enable_fw_download(struct ieee80211_hw *hw, bool enable)
 {
@@ -172,7 +169,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 *bufferPtr = (u8 *) buffer;
 
-        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 (IS_CHIP_VER_B(version)) {
                 u32 pageNums, remainSize;
@@ -186,7 +183,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 
                 if (pageNums > 4) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Page numbers should not greater then 4\n"));
+                                 "Page numbers should not greater then 4\n");
                 }
 
                 for (page = 0; page < pageNums; page++) {
@@ -219,13 +216,12 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
 
         if (counter >= FW_8192C_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;
@@ -238,9 +234,8 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
                 value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
                 if (value32 & WINTINI_RDY) {
                         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                                 ("Polling FW ready success!!"
-                                 " REG_MCUFWDL:0x%08x .\n",
-                                 value32));
+                                 "Polling FW ready success!! REG_MCUFWDL:0x%08x\n",
+                                 value32);
                         return 0;
                 }
 
@@ -249,7 +244,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
         } while (counter++ < FW_8192C_POLLING_TIMEOUT_COUNT);
 
         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                 ("Polling FW ready fail!! REG_MCUFWDL:0x%08x .\n", value32));
+                 "Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", value32);
         return -EIO;
 }
 
@@ -262,20 +257,19 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
         u32 fwsize;
         enum version_8192c version = rtlhal->version;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
 
-        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
         pfwdata = (u8 *) rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
 
         if (IS_FW_HEADER_EXIST(pfwheader)) {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
-                         ("Firmware Version(%d), Signature(%#x),Size(%d)\n",
+                         "Firmware Version(%d), Signature(%#x),Size(%d)\n",
                          le16_to_cpu(pfwheader->version),
                          le16_to_cpu(pfwheader->signature),
-                         (uint)sizeof(struct rtl92c_firmware_header)));
+                         (uint)sizeof(struct rtl92c_firmware_header));
 
                 pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
                 fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
@@ -287,10 +281,10 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
 
         if (_rtl92c_fw_free_to_go(hw)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is not ready to run!\n"));
+                         "Firmware is not ready to run!\n");
         } else {
                 RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                         ("Firmware is ready to run!\n"));
+                         "Firmware is ready to run!\n");
         }
 
         return 0;
@@ -328,22 +322,22 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
         unsigned long flag;
         u8 idx;
 
-        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)
@@ -363,8 +357,7 @@ static void _rtl92c_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;
                 }
 
@@ -388,7 +381,7 @@ static void _rtl92c_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;
                 }
 
@@ -398,8 +391,8 @@ static void _rtl92c_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;
                         }
 
@@ -408,14 +401,14 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         isfw_read = _rtl92c_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;
                 }
 
@@ -423,8 +416,8 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                 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:
@@ -493,7 +486,7 @@ static void _rtl92c_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;
                 }
 
@@ -504,29 +497,22 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
                         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 rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw,
                          u8 element_id, u32 cmd_len, u8 *p_cmdbuffer)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
-                RT_ASSERT(false, ("return H2C cmd because of Fw "
-                                  "download fail!!!\n"));
-                return;
-        }
-
         memset(tmp_cmdbuf, 0, 8);
         memcpy(tmp_cmdbuf, p_cmdbuffer, cmd_len);
         _rtl92c_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -547,7 +533,7 @@ void rtl92c_firmware_selfreset(struct ieee80211_hw *hw)
         while (u1b_tmp & BIT(2)) {
                 delay--;
                 if (delay == 0) {
-                        RT_ASSERT(false, ("8051 reset fail.\n"));
+                        RT_ASSERT(false, "8051 reset fail\n");
                         break;
                 }
                 udelay(50);
@@ -562,7 +548,7 @@ void rtl92c_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);
@@ -570,7 +556,7 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode)
                                               ppsc->reg_max_lps_awakeintvl);
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",
                       u1_h2c_set_pwrmode, 3);
         rtl92c_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
 
@@ -780,14 +766,16 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       u1RsvdPageLoc, 3);
 
 
         skb = dev_alloc_skb(totalpacketlen);
+        if (!skb)
+                return;
         memcpy((u8 *) skb_put(skb, totalpacketlen),
                &reserved_page_packet, totalpacketlen);
 
@@ -798,15 +786,14 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
 
         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:\n",
-                                u1RsvdPageLoc, 3);
+                              "H2C_RSVDPAGE", u1RsvdPageLoc, 3);
                 rtl92c_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");
 }
 EXPORT_SYMBOL(rtl92c_set_fw_rsvdpagepkt);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
index cec5a3a1cc53..780ea5b1e24c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/main.c b/drivers/net/wireless/rtlwifi/rtl8192c/main.c
index 605ff191aeb7..918b1d129e77 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/main.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/main.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,8 @@
  *
  *****************************************************************************/
 
-#include <linux/module.h>
 #include "../wifi.h"
+#include <linux/module.h>
 
 
 MODULE_AUTHOR("lizhaoming       <chaoming_li@realsil.com.cn>");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
index 1f07558debf2..22e998dd2f32 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.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
@@ -42,16 +42,15 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 returnvalue, originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x)\n", regaddr,
-                                               bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
         originalvalue = rtl_read_dword(rtlpriv, regaddr);
         bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("BBR MASK=0x%x "
-                                               "Addr[0x%x]=0x%x\n", bitmask,
-                                               regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
 
         return returnvalue;
 
@@ -64,9 +63,9 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                                               " data(%#x)\n", regaddr, bitmask,
-                                               data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -76,9 +75,9 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,
 
         rtl_write_dword(rtlpriv, regaddr, data);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                                               " data(%#x)\n", regaddr, bitmask,
-                                               data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
 }
 EXPORT_SYMBOL(rtl92c_phy_set_bb_reg);
@@ -86,7 +85,7 @@ EXPORT_SYMBOL(rtl92c_phy_set_bb_reg);
 u32 _rtl92c_phy_fw_rf_serial_read(struct ieee80211_hw *hw,
                                   enum radio_path rfpath, u32 offset)
 {
-        RT_ASSERT(false, ("deprecated!\n"));
+        RT_ASSERT(false, "deprecated!\n");
         return 0;
 
 }
@@ -96,7 +95,7 @@ void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
                                     enum radio_path rfpath, u32 offset,
                                     u32 data)
 {
-        RT_ASSERT(false, ("deprecated!\n"));
+        RT_ASSERT(false, "deprecated!\n");
 }
 EXPORT_SYMBOL(_rtl92c_phy_fw_rf_serial_write);
 
@@ -114,7 +113,7 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
         offset &= 0x3f;
         newoffset = offset;
         if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("return all one\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "return all one\n");
                 return 0xFFFFFFFF;
         }
         tmplong = rtl_get_bbreg(hw, RFPGA0_XA_HSSIPARAMETER2, MASKDWORD);
@@ -144,9 +143,8 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw,
         else
                 retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                                          BLSSIREADBACKDATA);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x]=0x%x\n",
-                                               rfpath, pphyreg->rflssi_readback,
-                                               retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
         return retvalue;
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_read);
@@ -162,16 +160,15 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
         if (RT_CANNOT_IO(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("stop\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "stop\n");
                 return;
         }
         offset &= 0x3f;
         newoffset = offset;
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                                               rfpath, pphyreg->rf3wire_offset,
-                                               data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 EXPORT_SYMBOL(_rtl92c_phy_rf_serial_write);
 
@@ -216,16 +213,16 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
                                                  BASEBAND_CONFIG_PHY_REG);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Write BB Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
                 return false;
         }
         if (rtlphy->rf_type == RF_1T2R) {
                 _rtl92c_phy_bb_config_1t(hw);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Config to 1T!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Config to 1T!!\n");
         }
         if (rtlefuse->autoload_failflag == false) {
                 rtlphy->pwrgroup_cnt = 0;
@@ -233,13 +230,13 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
                                                    BASEBAND_CONFIG_PHY_REG);
         }
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("BB_PG Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
                 return false;
         }
         rtstatus = rtlpriv->cfg->ops->config_bb_with_headerfile(hw,
                                                  BASEBAND_CONFIG_AGC_TAB);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("AGC Table Fail\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
         rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
@@ -260,114 +257,114 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
         if (regaddr == RTXAGC_A_RATE18_06) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0]));
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][0]);
         }
         if (regaddr == RTXAGC_A_RATE54_24) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1]));
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][1]);
         }
         if (regaddr == RTXAGC_A_CCK1_MCS32) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6]));
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][6]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7]));
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][7]);
         }
         if (regaddr == RTXAGC_A_MCS03_MCS00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2]));
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][2]);
         }
         if (regaddr == RTXAGC_A_MCS07_MCS04) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3]));
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][3]);
         }
         if (regaddr == RTXAGC_A_MCS11_MCS08) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4]));
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][4]);
         }
         if (regaddr == RTXAGC_A_MCS15_MCS12) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5]));
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][5]);
         }
         if (regaddr == RTXAGC_B_RATE18_06) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8]));
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][8]);
         }
         if (regaddr == RTXAGC_B_RATE54_24) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9]));
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][9]);
         }
         if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14]));
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][14]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15]));
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][15]);
         }
         if (regaddr == RTXAGC_B_MCS03_MCS00) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10]));
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][10]);
         }
         if (regaddr == RTXAGC_B_MCS07_MCS04) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11]));
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][11]);
         }
         if (regaddr == RTXAGC_B_MCS11_MCS08) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12]));
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][12]);
         }
         if (regaddr == RTXAGC_B_MCS15_MCS12) {
                 rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13] = data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13]));
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%x\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->MCS_TXPWR[rtlphy->pwrgroup_cnt][13]);
 
                 rtlphy->pwrgroup_cnt++;
         }
@@ -389,12 +386,11 @@ void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
             (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, MASKBYTE0);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default initial gain (c50=0x%x, "
-                  "c58=0x%x, c60=0x%x, c68=0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]));
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
 
         rtlphy->framesync = (u8) rtl_get_bbreg(hw,
                                                ROFDM0_RXDETECTOR3, MASKBYTE0);
@@ -402,8 +398,8 @@ void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                                               ROFDM0_RXDETECTOR2, MASKDWORD);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                  ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
@@ -615,8 +611,8 @@ bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm)
         else
                 ofdmtxpwridx = 0;
         RT_TRACE(rtlpriv, COMP_TXAGC, DBG_TRACE,
-                 ("%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
-                  power_indbm, ccktxpwridx, ofdmtxpwridx));
+                 "%lx dBm, ccktxpwridx = %d, ofdmtxpwridx = %d\n",
+                 power_indbm, ccktxpwridx, ofdmtxpwridx);
         for (idx = 0; idx < 14; idx++) {
                 for (rf_path = 0; rf_path < 2; rf_path++) {
                         rtlefuse->txpwrlevel_cck[rf_path][idx] = ccktxpwridx;
@@ -710,7 +706,7 @@ void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown Scan Backup operation.\n"));
+                                 "Unknown Scan Backup operation\n");
                         break;
                 }
         }
@@ -732,7 +728,7 @@ void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw,
                 rtlpriv->cfg->ops->phy_set_bw_mode_callback(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("FALSE driver sleep or unload\n"));
+                         "FALSE driver sleep or unload\n");
                 rtlphy->set_bwmode_inprogress = false;
                 rtlphy->current_chan_bw = tmp_bw;
         }
@@ -747,7 +743,7 @@ void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw)
         u32 delay;
 
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n", rtlphy->current_channel));
+                 "switch to channel%d\n", rtlphy->current_channel);
         if (is_hal_stop(rtlhal))
                 return;
         do {
@@ -765,7 +761,7 @@ void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 EXPORT_SYMBOL(rtl92c_phy_sw_chnl_callback);
 
@@ -780,19 +776,18 @@ u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw)
         if (rtlphy->set_bwmode_inprogress)
                 return 0;
         RT_ASSERT((rtlphy->current_channel <= 14),
-                  ("WIRELESS_MODE_G but channel>14"));
+                  "WIRELESS_MODE_G but channel>14\n");
         rtlphy->sw_chnl_inprogress = true;
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         if (!(is_hal_stop(rtlhal)) && !(RT_CANNOT_IO(hw))) {
                 rtl92c_phy_sw_chnl_callback(hw);
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false schdule workitem\n"));
+                         "sw_chnl_inprogress false schdule workitem\n");
                 rtlphy->sw_chnl_inprogress = false;
         } else {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false driver sleep or"
-                          " unload\n"));
+                         "sw_chnl_inprogress false driver sleep or unload\n");
                 rtlphy->sw_chnl_inprogress = false;
         }
         return 1;
@@ -807,7 +802,7 @@ static bool _rtl92c_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
 
@@ -853,7 +848,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
-                  ("illegal channel for Zebra: %d\n", channel));
+                  "invalid channel for Zebra: %d\n", channel);
 
         _rtl92c_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
@@ -916,7 +911,7 @@ bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -1920,23 +1915,23 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                  iotype, rtlphy->set_io_inprogress));
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                 iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Resume DM after scan.\n"));
+                                 "[IO CMD] Resume DM after scan\n");
                         postprocessing = true;
                         break;
                 case IO_CMD_PAUSE_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Pause DM before scan.\n"));
+                                 "[IO CMD] Pause DM before scan\n");
                         postprocessing = true;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
         } while (false);
@@ -1947,7 +1942,7 @@ bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 return false;
         }
         rtl92c_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, ("<--IO Type(%#x)\n", iotype));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
         return true;
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io_cmd);
@@ -1958,8 +1953,8 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("--->Cmd(%#x), set_io_inprogress(%d)\n",
-                  rtlphy->current_io_type, rtlphy->set_io_inprogress));
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
                 dm_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -1973,12 +1968,12 @@ void rtl92c_phy_set_io(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("<---(%#x)\n", rtlphy->current_io_type));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
+                 rtlphy->current_io_type);
 }
 EXPORT_SYMBOL(rtl92c_phy_set_io);
 
@@ -2018,7 +2013,7 @@ void _rtl92c_phy_set_rf_sleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Switch RF timeout !!!.\n"));
+                         "Switch RF timeout !!!\n");
                 return;
         }
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
index 9a264c0d6127..cec10d696492 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
index 9fc804d89d65..04c3aef8a4f6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/def.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
index 2df33e53e15a..27b3af880d96 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.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
@@ -54,7 +54,7 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -67,28 +67,28 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -96,18 +96,18 @@ void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
index 07dd9552e82f..26747fa86005 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/dm.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index a3deaefa788c..48c7b5d3fc5b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.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
@@ -141,7 +141,7 @@ void rtl92ce_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -207,7 +207,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 e_aci;
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
 
                         rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
 
@@ -246,8 +246,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 *val = min_spacing_to_set;
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                          mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
 
                                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
@@ -261,8 +261,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
 
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
@@ -310,8 +310,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 }
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -348,8 +348,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -365,14 +365,14 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                                  "Write 0x%X\n", acm_ctrl));
+                                 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                                 acm_ctrl);
                         rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                         break;
                 }
@@ -507,8 +507,8 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                 }
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                        "not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -530,8 +530,8 @@ static bool _rtl92ce_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
 
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at "
-                                  "address %d!\n", address));
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
                         status = false;
                         break;
                 }
@@ -669,18 +669,15 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
         udelay(2);
 
         retry = 0;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("reg0xec:%x:%x\n",
-                                                rtl_read_dword(rtlpriv, 0xEC),
-                                                bytetmp));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "reg0xec:%x:%x\n",
+                 rtl_read_dword(rtlpriv, 0xEC), bytetmp);
 
         while ((bytetmp & BIT(0)) && retry < 1000) {
                 retry++;
                 udelay(50);
                 bytetmp = rtl_read_byte(rtlpriv, REG_APS_FSMCO + 1);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("reg0xec:%x:%x\n",
-                                                        rtl_read_dword(rtlpriv,
-                                                                       0xEC),
-                                                        bytetmp));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "reg0xec:%x:%x\n",
+                         rtl_read_dword(rtlpriv, 0xEC), bytetmp);
                 udelay(50);
         }
 
@@ -864,13 +861,13 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
         u8 sec_reg_value;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("not open "
-                                                        "hw encryption\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+                         "not open hw encryption\n");
                 return;
         }
 
@@ -886,7 +883,7 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+                 "The SECR-value %x\n", sec_reg_value);
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 
@@ -910,7 +907,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         rtlpriv->intf_ops->disable_aspm(hw);
         rtstatus = _rtl92ce_init_mac(hw);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Init MAC failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
                 err = 1;
                 return err;
         }
@@ -918,13 +915,9 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         err = rtl92c_download_fw(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW "
-                          "without FW now..\n"));
+                         "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                rtlhal->fw_ready = false;
                 return err;
-        } else {
-                rtlhal->fw_ready = true;
         }
 
         rtlhal->last_hmeboxnum = 0;
@@ -968,12 +961,12 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
         tmp_u1b = efuse_read_1byte(hw, 0x1FA);
         if (!(tmp_u1b & BIT(0))) {
                 rtl_set_rfreg(hw, RF90_PATH_A, 0x15, 0x0F, 0x05);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("PA BIAS path A\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path A\n");
         }
 
         if (!(tmp_u1b & BIT(1)) && is92c) {
                 rtl_set_rfreg(hw, RF90_PATH_B, 0x15, 0x0F, 0x05);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("PA BIAS path B\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "PA BIAS path B\n");
         }
 
         if (!(tmp_u1b & BIT(4))) {
@@ -982,7 +975,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x80);
                 udelay(10);
                 rtl_write_byte(rtlpriv, 0x16, tmp_u1b | 0x90);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("under 1.5V\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
         }
         rtl92c_dm_init(hw);
         rtlpci->being_init_adapter = false;
@@ -995,6 +988,7 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         enum version_8192c version = VERSION_UNKNOWN;
         u32 value32;
+        const char *versionid;
 
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
         if (value32 & TRP_VAUX_EN) {
@@ -1007,27 +1001,25 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
 
         switch (version) {
         case VERSION_B_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_B_CHIP_92C.\n"));
+                versionid = "B_CHIP_92C";
                 break;
         case VERSION_B_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_B_CHIP_88C.\n"));
+                versionid = "B_CHIP_88C";
                 break;
         case VERSION_A_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_A_CHIP_92C.\n"));
+                versionid = "A_CHIP_92C";
                 break;
         case VERSION_A_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Chip Version ID: VERSION_A_CHIP_88C.\n"));
+                versionid = "A_CHIP_88C";
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Chip Version ID: Unknown. Bug?\n"));
+                versionid = "Unknown. Bug?";
                 break;
         }
 
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Chip Version ID: %s\n", versionid);
+
         switch (version & 0x3) {
         case CHIP_88C:
                 rtlphy->rf_type = RF_1T1R;
@@ -1041,13 +1033,12 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw)
         default:
                 rtlphy->rf_type = RF_1T1R;
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("ERROR RF_Type is set!!"));
+                         "ERROR RF_Type is set!!\n");
                 break;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
-                  "RF_2T2R" : "RF_1T1R"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Chip RF Type: %s\n",
+                 rtlphy->rf_type == RF_2T2R ? "RF_2T2R" : "RF_1T1R");
 
         return version;
 }
@@ -1069,8 +1060,8 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
                 _rtl92ce_disable_bcn_sub_func(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Set HW_VAR_MEDIA_STATUS: "
-                          "No such media status(%x).\n", type));
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x)\n",
+                         type);
         }
 
         switch (type) {
@@ -1078,27 +1069,27 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
                 bt_msr |= MSR_NOLINK;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1171,7 +1162,7 @@ void rtl92ce_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1199,7 +1190,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 u1b_tmp;
         u32 u4b_tmp;
 
@@ -1210,7 +1200,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0);
-        if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
+        if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7))
                 rtl92c_firmware_selfreset(hw);
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51);
         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
@@ -1300,7 +1290,7 @@ void rtl92ce_set_beacon_interval(struct ieee80211_hw *hw)
         u16 bcn_interval = mac->beacon_interval;
 
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+                 "beacon_interval:%d\n", bcn_interval);
         rtl92ce_disable_interrupt(hw);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
         rtl92ce_enable_interrupt(hw);
@@ -1312,8 +1302,8 @@ void rtl92ce_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
 
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
@@ -1367,25 +1357,24 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                 i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_cck[rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_cck[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path]
-                                 [i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
@@ -1416,11 +1405,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
 
@@ -1457,13 +1446,13 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                         }
 
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
         }
 
@@ -1502,27 +1491,27 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
@@ -1531,10 +1520,9 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
@@ -1547,7 +1535,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
 static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
@@ -1567,19 +1555,19 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!");
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
 
@@ -1591,8 +1579,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                 *((u16 *) (&rtlefuse->dev_addr[i])) = usvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
 
         _rtl92ce_read_txpower_info_from_hwpg(hw,
                                              rtlefuse->autoload_failflag,
@@ -1608,7 +1595,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
 
         /* set channel paln to world wide 13 */
         rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
@@ -1662,7 +1649,7 @@ static void _rtl92ce_hal_customized_behavior(struct ieee80211_hw *hw)
                 break;
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("RT Customized ID: 0x%02X\n", rtlhal->oem_id));
+                 "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
 }
 
 void rtl92ce_read_eeprom_info(struct ieee80211_hw *hw)
@@ -1679,22 +1666,22 @@ void rtl92ce_read_eeprom_info(struct ieee80211_hw *hw)
         else
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("VersionID = 0x%4x\n",
-                                                rtlhal->version));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
                 _rtl92ce_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
         }
         _rtl92ce_hal_customized_behavior(hw);
 }
@@ -1790,8 +1777,8 @@ static void rtl92ce_update_hal_rate_table(struct ieee80211_hw *hw,
 
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -1919,16 +1906,15 @@ static void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw,
                 break;
         }
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("ratr_bitmap :%x\n", ratr_bitmap));
+                 "ratr_bitmap :%x\n", ratr_bitmap);
         *(u32 *)&rate_mask = EF4BYTE((ratr_bitmap & 0x0fffffff) |
                                      (ratr_index << 28));
         rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, "
-                                                 "ratr_val:%x, %x:%x:%x:%x:%x\n",
-                                                 ratr_index, ratr_bitmap,
-                                                 rate_mask[0], rate_mask[1],
-                                                 rate_mask[2], rate_mask[3],
-                                                 rate_mask[4]));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],
+                 rate_mask[4]);
         rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
 
         if (macid != 0)
@@ -1994,7 +1980,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio ON, RF ON\n"));
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
 
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
@@ -2002,7 +1988,7 @@ bool rtl92ce_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         } else if ((ppsc->hwradiooff == false)
                    && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio OFF, RF OFF\n"));
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
 
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
@@ -2053,7 +2039,7 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
 
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2081,8 +2067,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                        "not process\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2100,9 +2086,8 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
-                                                     DBG_EMERG,
-                                                     ("Can not find free hw"
-                                                     " security cam entry\n"));
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2116,31 +2101,31 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
 
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
 
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->sec.
                                               key_len[PAIRWISE_KEYIDX]);
 
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                       entry_id, enc_algo,
@@ -2149,7 +2134,7 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                       key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
 
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
index 07dbe3e340a5..52a3aea9b3de 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c b/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
index 28a1a707d09c..8283e9b27639 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.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
@@ -45,8 +45,8 @@ void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -62,7 +62,7 @@ void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -74,8 +74,8 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -97,7 +97,7 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -145,7 +145,7 @@ void rtl92ce_led_control(struct ieee80211_hw *hw,
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d.\n",
-                                ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n",
+                 ledaction);
         _rtl92ce_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
index 7dfccea2095b..c5761066d383 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/led.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
index 3b585aadabfc..c64daf25566a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.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
@@ -47,9 +47,9 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "rfpath(%#x), bitmask(%#x)\n",
-                                               regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -67,9 +67,8 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,
         spin_unlock(&rtlpriv->locks.rf_lock);
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), rfpath(%#x), "
-                  "bitmask(%#x), original_value(%#x)\n",
-                  regaddr, rfpath, bitmask, original_value));
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
@@ -121,8 +120,8 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                  regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -153,10 +152,9 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x), data(%#x), "
-                                               "rfpath(%#x)\n", regaddr,
-                                               bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
@@ -166,11 +164,10 @@ static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength = MAC_2T_ARRAYLENGTH;
         ptrarray = RTL8192CEMAC_2T_ARRAY;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Img:RTL8192CEMAC_2T_ARRAY\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         return true;
@@ -215,10 +212,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -226,10 +222,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       agctab_array_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The agctab_array_table[0] is "
-                                  "%x Rtl819XPHY_REGArray[1] is %x\n",
-                                  agctab_array_table[i],
-                                  agctab_array_table[i + 1]));
+                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 agctab_array_table[i],
+                                 agctab_array_table[i + 1]);
                 }
         }
         return true;
@@ -269,7 +264,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
         } else {
 
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -291,20 +286,20 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_arraylen = RADIOB_2TARRAYLENGTH;
                 radiob_array_table = RTL8192CE_RADIOB_2TARRAY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CERADIOA_2TARRAY\n"));
+                         "Radio_A:RTL8192CERADIOA_2TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
         } else {
                 radioa_arraylen = RADIOA_1TARRAYLENGTH;
                 radioa_array_table = RTL8192CE_RADIOA_1TARRAY;
                 radiob_arraylen = RADIOB_1TARRAYLENGTH;
                 radiob_array_table = RTL8192CE_RADIOB_1TARRAY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n"));
+                         "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -352,11 +347,11 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -371,10 +366,9 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"))
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
 
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
@@ -398,7 +392,7 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
@@ -423,12 +417,12 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         rtl92ce_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 void _rtl92ce_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
@@ -499,7 +493,7 @@ static void _rtl92ce_phy_set_rf_sleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Switch RF timeout !!!.\n"));
+                         "Switch RF timeout !!!\n");
                 return;
         }
         rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
@@ -526,7 +520,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 do {
                                         InitializeCount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                 ("IPS Set eRf nic enable\n"));
+                                                 "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
                                 } while ((rtstatus != true)
                                          && (InitializeCount < 10));
@@ -534,10 +528,10 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("Set ERFON sleeped:%d ms\n",
-                                          jiffies_to_msecs(jiffies -
-                                                   ppsc->
-                                                   last_sleep_jiffies)));
+                                         "Set ERFON sleeped:%d ms\n",
+                                         jiffies_to_msecs(jiffies -
+                                                          ppsc->
+                                                          last_sleep_jiffies));
                                 ppsc->last_awake_jiffies = jiffies;
                                 rtl92ce_phy_set_rf_on(hw);
                         }
@@ -553,7 +547,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:{
                         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic disable\n"));
+                                         "IPS Set eRf nic disable\n");
                                 rtl_ps_disable_nic(hw);
                                 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
@@ -578,35 +572,33 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                         continue;
                                 } else {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("eRf Off/Sleep: %d times "
-                                                  "TcbBusyQueue[%d] =%d before "
-                                                  "doze!\n", (i + 1), queue_id,
-                                                  skb_queue_len(&ring->queue)));
+                                                 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                                 i + 1, queue_id,
+                                                 skb_queue_len(&ring->queue));
 
                                         udelay(10);
                                         i++;
                                 }
                                 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("\n ERFSLEEP: %d times "
-                                                  "TcbBusyQueue[%d] = %d !\n",
-                                                  MAX_DOZE_WAITING_TIMES_9x,
-                                                  queue_id,
-                                                  skb_queue_len(&ring->queue)));
+                                                 "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                                 MAX_DOZE_WAITING_TIMES_9x,
+                                                 queue_id,
+                                                 skb_queue_len(&ring->queue));
                                         break;
                                 }
                         }
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("Set ERFSLEEP awaked:%d ms\n",
-                                  jiffies_to_msecs(jiffies -
-                                                   ppsc->last_awake_jiffies)));
+                                 "Set ERFSLEEP awaked:%d ms\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_awake_jiffies));
                         ppsc->last_sleep_jiffies = jiffies;
                         _rtl92ce_phy_set_rf_sleep(hw);
                         break;
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
index be2c92adef33..d5e3b704f930 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index ba5ff0411f0a..43806d9d1e13 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
index d3b01e6023ba..69d720dd9c38 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.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
@@ -56,7 +56,7 @@ void rtl92ce_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -123,8 +123,8 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
 
@@ -133,22 +133,22 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
 
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
@@ -171,8 +171,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase0 << 8) | powerBase0;
                 *(ofdmbase + i) = powerBase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
@@ -187,8 +187,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                 *(mcsbase + i) = powerBase1;
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -215,9 +215,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 1:
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
@@ -225,9 +224,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                             powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 40MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         } else {
                                 if (rtlphy->pwrgroup_cnt == 1)
                                         chnlgroup = 0;
@@ -249,9 +247,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                               powerBase1[rf]);
 
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, 20MHz, "
-                                         "writeVal(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'), writeVal));
+                                        "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeVal);
                         }
                         break;
                 case 2:
@@ -259,27 +256,24 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Better regulatory, "
-                                 "writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Better regulatory, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 3:
                         chnlgroup = 0;
 
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht40[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht40[rf][channel -
+                                                                    1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz "
-                                         "rf(%c) = 0x%x\n",
-                                         ((rf == 0) ? 'A' : 'B'),
-                                         rtlefuse->pwrgroup_ht20[rf][channel -
-                                                                     1]));
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
+                                        rtlefuse->pwrgroup_ht20[rf][channel -
+                                                                    1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -311,15 +305,15 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
 
                         writeVal = customer_limit +
                             ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeVal rf(%c)= 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Customer, writeVal rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 default:
                         chnlgroup = 0;
@@ -329,9 +323,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, writeVal "
-                                 "rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance, writeVal rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 }
 
@@ -383,7 +376,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
 
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeVal));
+                        "Set 0x%x = %08x\n", regoffset, writeVal);
 
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
@@ -512,12 +505,12 @@ static bool _rtl92ce_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
 
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!\n", rfpath);
                         return false;
                 }
 
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
index 39ff03685986..6c8d56efceae 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rf.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
index 89ef6982ce50..2c3b73366cd2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.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,9 +27,6 @@
  *
  *****************************************************************************/
 
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
@@ -43,6 +40,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92c_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -92,9 +91,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         int err;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        char *fw_name = NULL;
 
         rtl8192ce_bt_reg_init(hw);
 
@@ -159,33 +156,27 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
 
         /* request fw */
         if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&
             !IS_92C_SERIAL(rtlhal->version))
-                fw_name = "rtlwifi/rtl8192cfwU.bin";
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";
         else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
-                fw_name = "rtlwifi/rtl8192cfwU_B.bin";
-        else
-                fw_name = rtlpriv->cfg->fw_name;
-        err = request_firmware(&firmware, fw_name, rtlpriv->io.dev);
+                rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";
+
+        rtlpriv->max_fw_size = 0x4000;
+        pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x4000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
 
         return 0;
 }
@@ -404,7 +395,7 @@ static int __init rtl92ce_module_init(void)
 
         ret = pci_register_driver(&rtl92ce_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
 
         return ret;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
index b7dc3263e433..d2367a5d0cf5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/table.c b/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
index ba938b91aa6f..752f943a84ae 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/table.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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/table.h b/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
index 3a6e8b6aeee0..8b79161f71be 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/table.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 4fb5ae24dee0..37b13636a778 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.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
@@ -725,7 +725,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                         ("Enable RDG function.\n"));
+                                         "Enable RDG function\n");
                                 SET_TX_DESC_RDG_ENABLE(pdesc, 1);
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
@@ -763,7 +763,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_BMC(pdesc, 1);
         }
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
@@ -821,8 +821,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
         }
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "H2C Tx Cmd Content\n",
-                      pdesc, TX_DESC_SIZE);
+                      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);
 }
 
 void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
@@ -837,8 +836,8 @@ void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d"
-                                          " not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -857,8 +856,8 @@ void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -877,8 +876,8 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -891,8 +890,8 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index c8977a50ca36..efb9ab270403 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
index d097efb1e717..f916555e6311 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/def.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
index f311baee668d..6fd39eaf361e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.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
@@ -52,7 +52,7 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
 
@@ -65,28 +65,28 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         if (undecorated_smoothed_pwdb >= TX_POWER_NEAR_FIELD_THRESH_LVL2) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
         } else if ((undecorated_smoothed_pwdb <
                     (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3)) &&
                    (undecorated_smoothed_pwdb >=
@@ -94,18 +94,18 @@ void rtl92cu_dm_dynamic_txpower(struct ieee80211_hw *hw)
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_LEVEL1;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                         "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
         } else if (undecorated_smoothed_pwdb <
                    (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("TXHIGHPWRLEVEL_NORMAL\n"));
+                         "TXHIGHPWRLEVEL_NORMAL\n");
         }
 
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92c_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
index 7f966c666b5a..d947e7d350bb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/dm.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 124cf633861c..0c74d4f2eeb4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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 "../wifi.h"
 #include "../efuse.h"
 #include "../base.h"
@@ -162,24 +160,24 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                 i, rtlefuse->
-                                 eeprom_chnlarea_txpwr_cck[rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_cck[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->
-                                 eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path]
-                                 [i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->
+                                eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++) {
                 for (i = 0; i < 14; i++) {
                         index = _rtl92c_get_chnl_group((u8) i);
@@ -205,11 +203,10 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
         for (i = 0; i < 3; i++) {
@@ -242,13 +239,13 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                       & 0xf0) >> 4);
                         }
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
         }
         for (i = 0; i < 14; i++) {
@@ -277,26 +274,26 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
         if (!autoload_fail)
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
         if (!autoload_fail) {
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = hwinfo[EEPROM_TSSI_B];
@@ -305,9 +302,9 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
         }
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+                "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
         if (!autoload_fail)
                 tempval = hwinfo[EEPROM_THERMAL_METER];
         else
@@ -320,7 +317,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
 static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
@@ -340,144 +337,8 @@ static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
         if (IS_HIGHT_PA(rtlefuse->board_type))
                 rtlefuse->external_pa = 1;
         pr_info("Board Type %x\n", rtlefuse->board_type);
-
-#ifdef CONFIG_ANTENNA_DIVERSITY
-        /* Antenna Diversity setting. */
-        if (registry_par->antdiv_cfg == 2) /* 2: From Efuse */
-                rtl_efuse->antenna_cfg = (contents[EEPROM_RF_OPT1]&0x18)>>3;
-        else
-                rtl_efuse->antenna_cfg = registry_par->antdiv_cfg; /* 0:OFF, */
-
-        pr_info("Antenna Config %x\n", rtl_efuse->antenna_cfg);
-#endif
-}
-
-#ifdef CONFIG_BT_COEXIST
-static void _update_bt_param(_adapter *padapter)
-{
-        struct btcoexist_priv    *pbtpriv = &(padapter->halpriv.bt_coexist);
-        struct registry_priv    *registry_par = &padapter->registrypriv;
-        if (2 != registry_par->bt_iso) {
-                /* 0:Low, 1:High, 2:From Efuse */
-                pbtpriv->BT_Ant_isolation = registry_par->bt_iso;
-        }
-        if (registry_par->bt_sco == 1) {
-                /* 0:Idle, 1:None-SCO, 2:SCO, 3:From Counter, 4.Busy,
-                 * 5.OtherBusy */
-                pbtpriv->BT_Service = BT_OtherAction;
-        } else if (registry_par->bt_sco == 2) {
-                pbtpriv->BT_Service = BT_SCO;
-        } else if (registry_par->bt_sco == 4) {
-                pbtpriv->BT_Service = BT_Busy;
-        } else if (registry_par->bt_sco == 5) {
-                pbtpriv->BT_Service = BT_OtherBusy;
-        } else {
-                pbtpriv->BT_Service = BT_Idle;
-        }
-        pbtpriv->BT_Ampdu = registry_par->bt_ampdu;
-        pbtpriv->bCOBT = _TRUE;
-        pbtpriv->BtEdcaUL = 0;
-        pbtpriv->BtEdcaDL = 0;
-        pbtpriv->BtRssiState = 0xff;
-        pbtpriv->bInitSet = _FALSE;
-        pbtpriv->bBTBusyTraffic = _FALSE;
-        pbtpriv->bBTTrafficModeSet = _FALSE;
-        pbtpriv->bBTNonTrafficModeSet = _FALSE;
-        pbtpriv->CurrentState = 0;
-        pbtpriv->PreviousState = 0;
-        pr_info("BT Coexistance = %s\n",
-                (pbtpriv->BT_Coexist == _TRUE) ? "enable" : "disable");
-        if (pbtpriv->BT_Coexist) {
-                if (pbtpriv->BT_Ant_Num == Ant_x2)
-                        pr_info("BlueTooth BT_Ant_Num = Antx2\n");
-                else if (pbtpriv->BT_Ant_Num == Ant_x1)
-                        pr_info("BlueTooth BT_Ant_Num = Antx1\n");
-                switch (pbtpriv->BT_CoexistType) {
-                case BT_2Wire:
-                        pr_info("BlueTooth BT_CoexistType = BT_2Wire\n");
-                        break;
-                case BT_ISSC_3Wire:
-                        pr_info("BlueTooth BT_CoexistType = BT_ISSC_3Wire\n");
-                        break;
-                case BT_Accel:
-                        pr_info("BlueTooth BT_CoexistType = BT_Accel\n");
-                        break;
-                case BT_CSR_BC4:
-                        pr_info("BlueTooth BT_CoexistType = BT_CSR_BC4\n");
-                        break;
-                case BT_CSR_BC8:
-                        pr_info("BlueTooth BT_CoexistType = BT_CSR_BC8\n");
-                        break;
-                case BT_RTL8756:
-                        pr_info("BlueTooth BT_CoexistType = BT_RTL8756\n");
-                        break;
-                default:
-                        pr_info("BlueTooth BT_CoexistType = Unknown\n");
-                        break;
-                }
-                pr_info("BlueTooth BT_Ant_isolation = %d\n",
-                        pbtpriv->BT_Ant_isolation);
-                switch (pbtpriv->BT_Service) {
-                case BT_OtherAction:
-                        pr_info("BlueTooth BT_Service = BT_OtherAction\n");
-                        break;
-                case BT_SCO:
-                        pr_info("BlueTooth BT_Service = BT_SCO\n");
-                        break;
-                case BT_Busy:
-                        pr_info("BlueTooth BT_Service = BT_Busy\n");
-                        break;
-                case BT_OtherBusy:
-                        pr_info("BlueTooth BT_Service = BT_OtherBusy\n");
-                        break;
-                default:
-                        pr_info("BlueTooth BT_Service = BT_Idle\n");
-                        break;
-                }
-                pr_info("BT_RadioSharedType = 0x%x\n",
-                        pbtpriv->BT_RadioSharedType);
-        }
 }
 
-#define GET_BT_COEXIST(priv) (&priv->bt_coexist)
-
-static void _rtl92cu_read_bluetooth_coexistInfo(struct ieee80211_hw *hw,
-                                                u8 *contents,
-                                                bool bautoloadfailed);
-{
-        HAL_DATA_TYPE   *pHalData = GET_HAL_DATA(Adapter);
-        bool isNormal = IS_NORMAL_CHIP(pHalData->VersionID);
-        struct btcoexist_priv    *pbtpriv = &pHalData->bt_coexist;
-        u8      rf_opt4;
-
-        _rtw_memset(pbtpriv, 0, sizeof(struct btcoexist_priv));
-        if (AutoloadFail) {
-                pbtpriv->BT_Coexist = _FALSE;
-                pbtpriv->BT_CoexistType = BT_2Wire;
-                pbtpriv->BT_Ant_Num = Ant_x2;
-                pbtpriv->BT_Ant_isolation = 0;
-                pbtpriv->BT_RadioSharedType = BT_Radio_Shared;
-                return;
-        }
-        if (isNormal) {
-                if (pHalData->BoardType == BOARD_USB_COMBO)
-                        pbtpriv->BT_Coexist = _TRUE;
-                else
-                        pbtpriv->BT_Coexist = ((PROMContent[EEPROM_RF_OPT3] &
-                                              0x20) >> 5); /* bit[5] */
-                rf_opt4 = PROMContent[EEPROM_RF_OPT4];
-                pbtpriv->BT_CoexistType = ((rf_opt4&0xe)>>1); /* bit [3:1] */
-                pbtpriv->BT_Ant_Num = (rf_opt4&0x1); /* bit [0] */
-                pbtpriv->BT_Ant_isolation = ((rf_opt4&0x10)>>4); /* bit [4] */
-                pbtpriv->BT_RadioSharedType = ((rf_opt4&0x20)>>5); /* bit [5] */
-        } else {
-                pbtpriv->BT_Coexist = (PROMContent[EEPROM_RF_OPT4] >> 4) ?
-                                       _TRUE : _FALSE;
-        }
-        _update_bt_param(Adapter);
-}
-#endif
-
 static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -494,17 +355,17 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         }
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
         eeprom_id = le16_to_cpu(*((__le16 *)&hwinfo[0]));
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
         if (rtlefuse->autoload_failflag)
@@ -518,16 +379,15 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                                            rtlefuse->autoload_failflag, hwinfo);
         rtlefuse->eeprom_vid = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VID]);
         rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 (" VID = 0x%02x PID = 0x%02x\n",
-                 rtlefuse->eeprom_vid, rtlefuse->eeprom_did));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, " VID = 0x%02x PID = 0x%02x\n",
+                 rtlefuse->eeprom_vid, rtlefuse->eeprom_did);
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->eeprom_version =
                          le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
+                 rtlefuse->eeprom_oemid);
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
                 switch (rtlefuse->eeprom_oemid) {
                 case EEPROM_CID_DEFAULT:
@@ -554,10 +414,6 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
                 }
         }
         _rtl92cu_read_board_type(hw, hwinfo);
-#ifdef CONFIG_BT_COEXIST
-        _rtl92cu_read_bluetooth_coexistInfo(hw, hwinfo,
-                                            rtlefuse->autoload_failflag);
-#endif
 }
 
 static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
@@ -579,8 +435,8 @@ static void _rtl92cu_hal_customized_behavior(struct ieee80211_hw *hw)
         default:
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("RT Customized ID: 0x%02X\n", rtlhal->oem_id));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RT Customized ID: 0x%02X\n",
+                 rtlhal->oem_id);
 }
 
 void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
@@ -596,11 +452,11 @@ void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         rtlefuse->epromtype = (tmp_u1b & BOOT_FROM_EEPROM) ?
                                EEPROM_93C46 : EEPROM_BOOT_EFUSE;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from %s\n",
-                 (tmp_u1b & BOOT_FROM_EEPROM) ? "EERROM" : "EFUSE"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from %s\n",
+                 tmp_u1b & BOOT_FROM_EEPROM ? "EERROM" : "EFUSE");
         rtlefuse->autoload_failflag = (tmp_u1b & EEPROM_EN) ? false : true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload %s\n",
-                 (tmp_u1b & EEPROM_EN) ? "OK!!" : "ERR!!"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload %s\n",
+                 tmp_u1b & EEPROM_EN ? "OK!!" : "ERR!!");
         _rtl92cu_read_adapter_info(hw);
         _rtl92cu_hal_customized_behavior(hw);
         return;
@@ -618,13 +474,12 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
         do {
                 if (rtl_read_byte(rtlpriv, REG_APS_FSMCO) & PFM_ALDN) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Autoload Done!\n"));
+                                 "Autoload Done!\n");
                         break;
                 }
                 if (pollingCount++ > 100) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Failed to polling REG_APS_FSMCO[PFM_ALDN]"
-                                 " done!\n"));
+                                 "Failed to polling REG_APS_FSMCO[PFM_ALDN] done!\n");
                         return -ENODEV;
                 }
         } while (true);
@@ -639,8 +494,8 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                 value8 |= LDV12_EN;
                 rtl_write_byte(rtlpriv, REG_LDOV12D_CTRL, value8);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         (" power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x.\n",
-                         value8));
+                         " power-on :REG_LDOV12D_CTRL Reg0x21:0x%02x\n",
+                         value8);
                 udelay(100);
                 value8 = rtl_read_byte(rtlpriv, REG_SYS_ISO_CTRL);
                 value8 &= ~ISO_MD2PP;
@@ -658,8 +513,7 @@ static int _rtl92cu_init_power_on(struct ieee80211_hw *hw)
                 }
                 if (pollingCount++ > 100) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                                 ("Failed to polling REG_APS_FSMCO[APFM_ONMAC]"
-                                 " done!\n"));
+                                 "Failed to polling REG_APS_FSMCO[APFM_ONMAC] done!\n");
                         return -ENODEV;
                 }
         } while (true);
@@ -877,8 +731,8 @@ static void _rtl92cu_init_chipN_three_out_ep_priority(struct ieee80211_hw *hw,
                 hiQ     = QUEUE_HIGH;
         }
         _rtl92c_init_chipN_reg_priority(hw, beQ, bkQ, viQ, voQ, mgtQ, hiQ);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                 ("Tx queue select :0x%02x..\n", queue_sel));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
+                 queue_sel);
 }
 
 static void _rtl92cu_init_chipN_queue_priority(struct ieee80211_hw *hw,
@@ -937,8 +791,8 @@ static void _rtl92cu_init_chipT_queue_priority(struct ieee80211_hw *hw,
                 break;
         }
         rtl_write_byte(rtlpriv, (REG_TRXDMA_CTRL+1), hq_sele);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                 ("Tx queue select :0x%02x..\n", hq_sele));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Tx queue select :0x%02x..\n",
+                 hq_sele);
 }
 
 static void _rtl92cu_init_queue_priority(struct ieee80211_hw *hw,
@@ -998,7 +852,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
 
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Failed to init power on!\n"));
+                         "Failed to init power on!\n");
                 return err;
         }
         if (!wmm_enable) {
@@ -1010,7 +864,7 @@ static int _rtl92cu_init_mac(struct ieee80211_hw *hw)
         }
         if (false == rtl92c_init_llt_table(hw, boundary)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Failed to init LLT Table!\n"));
+                         "Failed to init LLT Table!\n");
                 return -EINVAL;
         }
         _rtl92cu_init_queue_reserved_page(hw, wmm_enable, out_ep_nums,
@@ -1043,12 +897,12 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open sw encryption\n"));
+                         "not open sw encryption\n");
                 return;
         }
         sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable;
@@ -1059,8 +913,8 @@ void rtl92cu_enable_hw_security_config(struct ieee80211_hw *hw)
         if (IS_NORMAL_CHIP(rtlhal->version))
                 sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
+                 sec_reg_value);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
@@ -1111,34 +965,6 @@ static void _InitPABias(struct ieee80211_hw *hw)
         }
 }
 
-static void _InitAntenna_Selection(struct ieee80211_hw *hw)
-{
-#ifdef CONFIG_ANTENNA_DIVERSITY
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        struct rtl_phy *rtlphy = &(rtlpriv->phy);
-
-        if (pHalData->AntDivCfg == 0)
-                return;
-
-        if (rtlphy->rf_type == RF_1T1R) {
-                rtl_write_dword(rtlpriv, REG_LEDCFG0,
-                                rtl_read_dword(rtlpriv,
-                                REG_LEDCFG0)|BIT(23));
-                rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
-                if (rtl_get_bbreg(hw, RFPGA0_XA_RFINTERFACEOE, 0x300) ==
-                    Antenna_A)
-                        pHalData->CurAntenna = Antenna_A;
-                else
-                        pHalData->CurAntenna = Antenna_B;
-        }
-#endif
-}
-
-static void _dump_registers(struct ieee80211_hw *hw)
-{
-}
-
 static void _update_mac_setting(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -1163,18 +989,15 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         rtlhal->hw_type = HARDWARE_TYPE_RTL8192CU;
         err = _rtl92cu_init_mac(hw);
         if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("init mac failed!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "init mac failed!\n");
                 return err;
         }
         err = rtl92c_download_fw(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW without FW now..\n"));
+                         "Failed to download FW. Init HW without FW now..\n");
                 err = 1;
-                rtlhal->fw_ready = false;
                 return err;
-        } else {
-                rtlhal->fw_ready = true;
         }
         rtlhal->last_hmeboxnum = 0; /* h2c */
         _rtl92cu_phy_param_tab_init(hw);
@@ -1209,10 +1032,8 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
         }
         _rtl92cu_hw_configure(hw);
         _InitPABias(hw);
-        _InitAntenna_Selection(hw);
         _update_mac_setting(hw);
         rtl92c_dm_init(hw);
-        _dump_registers(hw);
         return err;
 }
 
@@ -1270,24 +1091,21 @@ static void  _ResetDigitalProcedure1(struct ieee80211_hw *hw, bool bWithoutHWSM)
                 if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(1)) {
                         /* reset MCU ready status */
                         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
-                        if (rtlhal->fw_ready) {
-                                /* 8051 reset by self */
-                                rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
-                                while ((retry_cnts++ < 100) &&
-                                       (FEN_CPUEN & rtl_read_word(rtlpriv,
-                                       REG_SYS_FUNC_EN))) {
-                                        udelay(50);
-                                }
-                                if (retry_cnts >= 100) {
-                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                ("#####=> 8051 reset failed!.."
-                                                ".......................\n"););
-                                        /* if 8051 reset fail, reset MAC. */
-                                        rtl_write_byte(rtlpriv,
-                                                       REG_SYS_FUNC_EN + 1,
-                                                       0x50);
-                                        udelay(100);
-                                }
+                        /* 8051 reset by self */
+                        rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
+                        while ((retry_cnts++ < 100) &&
+                               (FEN_CPUEN & rtl_read_word(rtlpriv,
+                               REG_SYS_FUNC_EN))) {
+                                udelay(50);
+                        }
+                        if (retry_cnts >= 100) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                         "#####=> 8051 reset failed!.........................\n");
+                                /* if 8051 reset fail, reset MAC. */
+                                rtl_write_byte(rtlpriv,
+                                               REG_SYS_FUNC_EN + 1,
+                                               0x50);
+                                udelay(100);
                         }
                 }
                 /* Reset MAC and Enable 8051 */
@@ -1495,35 +1313,36 @@ static int _rtl92cu_set_media_status(struct ieee80211_hw *hw,
                 _rtl92cu_resume_tx_beacon(hw);
                 _rtl92cu_disable_bcn_sub_func(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, ("Set HW_VAR_MEDIA_"
-                         "STATUS:No such media status(%x).\n", type));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
+                         "Set HW_VAR_MEDIA_STATUS:No such media status(%x)\n",
+                         type);
         }
         switch (type) {
         case NL80211_IFTYPE_UNSPECIFIED:
                 bt_msr |= MSR_NOLINK;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 goto error_out;
         }
         rtl_write_byte(rtlpriv, (MSR), bt_msr);
@@ -1684,8 +1503,8 @@ void rtl92cu_set_beacon_related_registers(struct ieee80211_hw *hw)
         value32 |= TSFRST;
         rtl_write_dword(rtlpriv, REG_TCR, value32);
         RT_TRACE(rtlpriv, COMP_INIT|COMP_BEACON, DBG_LOUD,
-                 ("SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",
-                 value32));
+                 "SetBeaconRelatedRegisters8192CUsb(): Set TCR(%x)\n",
+                 value32);
         /* TODO: Modify later (Find the right parameters)
          * NOTE: Fix test chip's bug (about contention windows's randomness) */
         if ((mac->opmode == NL80211_IFTYPE_ADHOC) ||
@@ -1702,8 +1521,8 @@ void rtl92cu_set_beacon_interval(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u16 bcn_interval = mac->beacon_interval;
 
-        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+        RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG, "beacon_interval:%d\n",
+                 bcn_interval);
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
 }
 
@@ -1767,7 +1586,7 @@ void rtl92cu_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -1827,8 +1646,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_byte(rtlpriv, REG_MAC_SPEC_SIFS + 1, val[0]);
                         rtl_write_byte(rtlpriv, REG_R2T_SIFS+1, val[0]);
                         rtl_write_byte(rtlpriv, REG_T2T_SIFS+1, val[0]);
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SIFS\n"));
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD, "HW_VAR_SIFS\n");
                         break;
                 }
         case HW_VAR_SLOT_TIME:{
@@ -1837,7 +1655,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
 
                         rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
                         if (QOS_MODE) {
                                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -1901,8 +1719,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                      min_spacing_to_set);
                                 *val = min_spacing_to_set;
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                        ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                        mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
                                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
                         }
@@ -1916,8 +1734,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg &= 0x07;
                         mac->min_space_cfg |= (density_to_set << 3);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
                         break;
@@ -1950,8 +1768,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                        p_regtoset[index]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -1969,8 +1787,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                          AC_PARAM_ECW_MAX_OFFSET);
                         u4b_ac_param |= (u32) tx_op << AC_PARAM_TXOP_OFFSET;
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("queue:%x, ac_param:%x\n", e_aci,
-                                  u4b_ac_param));
+                                 "queue:%x, ac_param:%x\n",
+                                 e_aci, u4b_ac_param);
                         switch (e_aci) {
                         case AC1_BK:
                                 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM,
@@ -1989,8 +1807,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                 u4b_ac_param);
                                 break;
                         default:
-                                RT_ASSERT(false, ("SetHwReg8185(): invalid"
-                                          " aci: %d !\n", e_aci));
+                                RT_ASSERT(false,
+                                          "SetHwReg8185(): invalid aci: %d !\n",
+                                          e_aci);
                                 break;
                         }
                         if (rtlusb->acm_method != eAcmWay2_SW)
@@ -2020,8 +1839,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -2037,13 +1856,13 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                                  "Write 0x%X\n", acm_ctrl));
+                                 "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                                 acm_ctrl);
                         rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                         break;
                 }
@@ -2051,7 +1870,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_dword(rtlpriv, REG_RCR, ((u32 *) (val))[0]);
                         mac->rx_conf = ((u32 *) (val))[0];
                         RT_TRACE(rtlpriv, COMP_RECV, DBG_DMESG,
-                                 ("### Set RCR(0x%08x) ###\n", mac->rx_conf));
+                                 "### Set RCR(0x%08x) ###\n", mac->rx_conf);
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
@@ -2060,8 +1879,9 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
                                        retry_limit << RETRY_LIMIT_LONG_SHIFT);
-                        RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG, ("Set HW_VAR_R"
-                                 "ETRY_LIMIT(0x%08x)\n", retry_limit));
+                        RT_TRACE(rtlpriv, COMP_MLME, DBG_DMESG,
+                                 "Set HW_VAR_RETRY_LIMIT(0x%08x)\n",
+                                 retry_limit);
                         break;
                 }
         case HW_VAR_DUAL_TSF_RST:
@@ -2165,8 +1985,8 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtl_write_word(rtlpriv, REG_RXFLTMAP2, *(u16 *)val);
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                        "not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -2239,8 +2059,8 @@ void rtl92cu_update_hal_rate_table(struct ieee80211_hw *hw,
                                (shortgi_rate << 4) | (shortgi_rate);
         }
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("%x\n", rtl_read_dword(rtlpriv,
-                 REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
@@ -2344,17 +2164,16 @@ void rtl92cu_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level)
                         ratr_bitmap &= 0x0f0ff0ff;
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("ratr_bitmap :%x\n",
-                 ratr_bitmap));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "ratr_bitmap :%x\n",
+                 ratr_bitmap);
         *(u32 *)&rate_mask = ((ratr_bitmap & 0x0fffffff) |
                                       ratr_index << 28);
         rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, "
-                                                "ratr_val:%x, %x:%x:%x:%x:%x\n",
-                                                ratr_index, ratr_bitmap,
-                                                rate_mask[0], rate_mask[1],
-                                                rate_mask[2], rate_mask[3],
-                                                rate_mask[4]));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
+                 "Rate_index:%x, ratr_val:%x, %x:%x:%x:%x:%x\n",
+                 ratr_index, ratr_bitmap,
+                 rate_mask[0], rate_mask[1], rate_mask[2], rate_mask[3],
+                 rate_mask[4]);
         rtl92c_fill_h2c_cmd(hw, H2C_RA_MASK, 5, rate_mask);
 }
 
@@ -2404,7 +2223,7 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
                         e_rfpowerstate_toset = (u1tmp & BIT(7)) ?
                                                ERFOFF : ERFON;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("pwrdown, 0x5c(BIT7)=%02x\n", u1tmp));
+                                 "pwrdown, 0x5c(BIT7)=%02x\n", u1tmp);
                 } else {
                         rtl_write_byte(rtlpriv, REG_MAC_PINMUX_CFG,
                                        rtl_read_byte(rtlpriv,
@@ -2413,27 +2232,26 @@ bool rtl92cu_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 * valid)
                         e_rfpowerstate_toset  = (u1tmp & BIT(3)) ?
                                                  ERFON : ERFOFF;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                ("GPIO_IN=%02x\n", u1tmp));
+                                 "GPIO_IN=%02x\n", u1tmp);
                 }
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("N-SS RF =%x\n",
-                         e_rfpowerstate_toset));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "N-SS RF =%x\n",
+                         e_rfpowerstate_toset);
         }
         if ((ppsc->hwradiooff) && (e_rfpowerstate_toset == ERFON)) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF  - HW "
-                         "Radio ON, RF ON\n"));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((!ppsc->hwradiooff) && (e_rfpowerstate_toset  ==
                     ERFOFF)) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("GPIOChangeRF  - HW"
-                         " Radio OFF\n"));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "GPIOChangeRF  - HW Radio OFF\n");
                 ppsc->hwradiooff = true;
                 actuallyset = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD ,
-                         ("pHalData->bHwRadioOff and eRfPowerStateToSet do not"
-                         " match: pHalData->bHwRadioOff %x, eRfPowerStateToSet "
-                         "%x\n", ppsc->hwradiooff, e_rfpowerstate_toset));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "pHalData->bHwRadioOff and eRfPowerStateToSet do not match: pHalData->bHwRadioOff %x, eRfPowerStateToSet %x\n",
+                         ppsc->hwradiooff, e_rfpowerstate_toset);
         }
         if (actuallyset) {
                 ppsc->hwradiooff = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
index 32f85cba106a..f41a3aa4a26f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
index 2ff9d8314e7b..75a2deb23af1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
@@ -47,8 +47,8 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -62,7 +62,7 @@ void rtl92cu_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -74,8 +74,8 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_usb_priv *usbpriv = rtl_usbpriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -95,7 +95,7 @@ void rtl92cu_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -136,7 +136,6 @@ void rtl92cu_led_control(struct ieee80211_hw *hw,
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n",
-                                ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
         _rtl92cu_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/led.h b/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
index decaee4d1eb1..0f372278b7af 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/led.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
index 9e0c8fcdf90f..025bdc2eba44 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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,10 +27,6 @@
  *
 ****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../pci.h"
 #include "../usb.h"
@@ -44,6 +40,8 @@
 #include "mac.h"
 #include "trx.h"
 
+#include <linux/module.h>
+
 /* macro to shorten lines */
 
 #define LINK_Q  ui_link_quality
@@ -57,6 +55,7 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         enum version_8192c chip_version = VERSION_UNKNOWN;
+        const char *versionid;
         u32 value32;
 
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
@@ -84,88 +83,69 @@ void rtl92c_read_chip_version(struct ieee80211_hw *hw)
                 }
         }
         rtlhal->version  = (enum version_8192c)chip_version;
-        pr_info("rtl8192cu: Chip version 0x%x\n", chip_version);
+        pr_info("Chip version 0x%x\n", chip_version);
         switch (rtlhal->version) {
         case VERSION_NORMAL_TSMC_CHIP_92C_1T2R:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Chip Version ID: VERSION_B_CHIP_92C.\n"));
+                versionid = "NORMAL_B_CHIP_92C";
                 break;
         case VERSION_NORMAL_TSMC_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_92C.\n"));
+                versionid = "NORMAL_TSMC_CHIP_92C";
                 break;
         case VERSION_NORMAL_TSMC_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_TSMC_CHIP_88C.\n"));
+                versionid = "NORMAL_TSMC_CHIP_88C";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_1T2R_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_i"
-                        "92C_1T2R_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_i92C_1T2R_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP_"
-                        "92C_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_88C_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_88C_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_88C_A_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_1T2R_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_92C_1T2R_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_1T2R_B_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_92C_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_92C_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_92C_B_CUT";
                 break;
         case VERSION_NORMAL_UMC_CHIP_88C_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMAL_UMC_CHIP"
-                        "_88C_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_88C_B_CUT";
                 break;
         case VERSION_NORMA_UMC_CHIP_8723_1T1R_A_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMA_UMC_CHIP"
-                        "_8723_1T1R_A_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_8723_1T1R_A_CUT";
                 break;
         case VERSION_NORMA_UMC_CHIP_8723_1T1R_B_CUT:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_NORMA_UMC_CHIP"
-                        "_8723_1T1R_B_CUT.\n"));
+                versionid = "NORMAL_UMC_CHIP_8723_1T1R_B_CUT";
                 break;
         case VERSION_TEST_CHIP_92C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_TEST_CHIP_92C.\n"));
+                versionid = "TEST_CHIP_92C";
                 break;
         case VERSION_TEST_CHIP_88C:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: VERSION_TEST_CHIP_88C.\n"));
+                versionid = "TEST_CHIP_88C";
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        ("Chip Version ID: ???????????????.\n"));
+                versionid = "UNKNOWN";
                 break;
         }
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
+                 "Chip Version ID: %s\n", versionid);
+
         if (IS_92C_SERIAL(rtlhal->version))
                 rtlphy->rf_type =
                          (IS_92C_1T2R(rtlhal->version)) ? RF_1T2R : RF_2T2R;
         else
                 rtlphy->rf_type = RF_1T1R;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Chip RF Type: %s\n", (rtlphy->rf_type == RF_2T2R) ?
-                  "RF_2T2R" : "RF_1T1R"));
+                 "Chip RF Type: %s\n",
+                 rtlphy->rf_type == RF_2T2R ? "RF_2T2R" : "RF_1T1R");
         if (get_rf_type(rtlphy) == RF_1T1R)
                 rtlpriv->dm.rfpath_rxenable[0] = true;
         else
                 rtlpriv->dm.rfpath_rxenable[0] =
                     rtlpriv->dm.rfpath_rxenable[1] = true;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("VersionID = 0x%4x\n",
-                                                rtlhal->version));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "VersionID = 0x%4x\n",
+                 rtlhal->version);
 }
 
 /**
@@ -192,9 +172,8 @@ bool rtl92c_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
                         break;
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at"
-                                 " address %d! _LLT_OP_VALUE(%x)\n",
-                                 address, _LLT_OP_VALUE(value)));
+                                 "Failed to polling write LLT done at address %d! _LLT_OP_VALUE(%x)\n",
+                                 address, _LLT_OP_VALUE(value));
                         status = false;
                         break;
                 }
@@ -272,7 +251,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
                         rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -298,7 +277,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                ("iillegal switch case\n"));
+                                 "illegal switch case\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -317,26 +296,26 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                 }
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry\n"));
+                                 "delete one entry\n");
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->sec.
                                               key_len[PAIRWISE_KEYIDX]);
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                 entry_id, enc_algo,
@@ -345,7 +324,7 @@ void rtl92c_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                 key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
                                                 rtlefuse->dev_addr,
@@ -421,8 +400,8 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
             AC_PARAM_ECW_MAX_OFFSET;
         u4b_ac_param |= (u32) le16_to_cpu(mac->ac[aci].tx_op) <<
                          AC_PARAM_TXOP_OFFSET;
-        RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD,
-                 ("queue:%x, ac_param:%x\n", aci, u4b_ac_param));
+        RT_TRACE(rtlpriv, COMP_QOS, DBG_LOUD, "queue:%x, ac_param:%x\n",
+                 aci, u4b_ac_param);
         switch (aci) {
         case AC1_BK:
                 rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, u4b_ac_param);
@@ -437,7 +416,7 @@ void rtl92c_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, u4b_ac_param);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -453,14 +432,14 @@ void rtl92c_set_mac_addr(struct ieee80211_hw *hw, const u8 *addr)
         for (i = 0 ; i < ETH_ALEN ; i++)
                 rtl_write_byte(rtlpriv, (REG_MACID + i), *(addr+i));
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("MAC Address: %02X-%02X-%02X-"
-                "%02X-%02X-%02X\n",
-                rtl_read_byte(rtlpriv, REG_MACID),
-                rtl_read_byte(rtlpriv, REG_MACID+1),
-                rtl_read_byte(rtlpriv, REG_MACID+2),
-                rtl_read_byte(rtlpriv, REG_MACID+3),
-                rtl_read_byte(rtlpriv, REG_MACID+4),
-                rtl_read_byte(rtlpriv, REG_MACID+5)));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
+                 "MAC Address: %02X-%02X-%02X-%02X-%02X-%02X\n",
+                 rtl_read_byte(rtlpriv, REG_MACID),
+                 rtl_read_byte(rtlpriv, REG_MACID+1),
+                 rtl_read_byte(rtlpriv, REG_MACID+2),
+                 rtl_read_byte(rtlpriv, REG_MACID+3),
+                 rtl_read_byte(rtlpriv, REG_MACID+4),
+                 rtl_read_byte(rtlpriv, REG_MACID+5));
 }
 
 void rtl92c_init_driver_info_size(struct ieee80211_hw *hw, u8 size)
@@ -478,26 +457,26 @@ int rtl92c_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
         case NL80211_IFTYPE_UNSPECIFIED:
                 value = NT_NO_LINK;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 value = NT_LINK_AD_HOC;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 value = NT_LINK_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 value = NT_AS_AP;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                        ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return -EOPNOTSUPP;
         }
         rtl_write_byte(rtlpriv, (REG_CR + 2), value);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
index 626d88e88e26..bf53652e4edd 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
index e49cf2244c75..8ac3bcca4d41 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.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
@@ -44,9 +44,9 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "rfpath(%#x), bitmask(%#x)\n",
-                                               regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
         if (rtlphy->rf_mode != RF_OP_BY_FW) {
                 original_value = _rtl92c_phy_rf_serial_read(hw,
                                                             rfpath, regaddr);
@@ -57,9 +57,8 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw,
         bitshift = _rtl92c_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), rfpath(%#x), "
-                  "bitmask(%#x), original_value(%#x)\n",
-                  regaddr, rfpath, bitmask, original_value));
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
         return readback_value;
 }
 
@@ -72,8 +71,8 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, bitshift;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                  regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
         if (rtlphy->rf_mode != RF_OP_BY_FW) {
                 if (bitmask != RFREG_OFFSET_MASK) {
                         original_value = _rtl92c_phy_rf_serial_read(hw,
@@ -97,9 +96,9 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
                 }
                 _rtl92c_phy_fw_rf_serial_write(hw, rfpath, regaddr, data);
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                                               "bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                                               regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw)
@@ -152,11 +151,10 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;
         ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Img:RTL8192CEMAC_2T_ARRAY\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         return true;
@@ -202,10 +200,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -213,10 +210,9 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       agctab_array_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The agctab_array_table[0] is "
-                                  "%x Rtl819XPHY_REGArray[1] is %x\n",
-                                  agctab_array_table[i],
-                                  agctab_array_table[i + 1]));
+                                 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 agctab_array_table[i],
+                                 agctab_array_table[i + 1]);
                 }
         }
         return true;
@@ -255,7 +251,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                 }
         } else {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -277,20 +273,20 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CERADIOA_2TARRAY\n"));
+                         "Radio_A:RTL8192CERADIOA_2TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
         } else {
                 radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;
                 radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;
                 radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;
                 radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n"));
+                         "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n"));
+                         "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
         switch (rfpath) {
         case RF90_PATH_A:
                 for (i = 0; i < radioa_arraylen; i = i + 2) {
@@ -338,11 +334,11 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -357,10 +353,9 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
         u8 reg_bw_opmode;
         u8 reg_prsr_rsc;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"))
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
         if (is_hal_stop(rtlhal)) {
                 rtlphy->set_bwmode_inprogress = false;
                 return;
@@ -381,7 +376,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         switch (rtlphy->current_chan_bw) {
@@ -403,12 +398,12 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         rtl92cu_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 void rtl92cu_bb_block_on(struct ieee80211_hw *hw)
@@ -480,7 +475,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         do {
                                 InitializeCount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic enable\n"));
+                                         "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
                         } while ((rtstatus != true)
                                  && (InitializeCount < 10));
@@ -488,10 +483,9 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("Set ERFON sleeped:%d ms\n",
-                                  jiffies_to_msecs(jiffies -
-                                                   ppsc->
-                                                   last_sleep_jiffies)));
+                                 "Set ERFON sleeped:%d ms\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_sleep_jiffies));
                         ppsc->last_awake_jiffies = jiffies;
                         rtl92ce_phy_set_rf_on(hw);
                 }
@@ -513,27 +507,25 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] "
-                                          "=%d before doze!\n", (i + 1),
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\nERFOFF: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x,
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("IPS Set eRf nic disable\n"));
+                                 "IPS Set eRf nic disable\n");
                         rtl_ps_disable_nic(hw);
                         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
@@ -557,33 +549,30 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times "
-                                          "TcbBusyQueue[%d] =%d before "
-                                          "doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\n ERFSLEEP: %d times "
-                                          "TcbBusyQueue[%d] = %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x,
-                                          queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x,
+                                         queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("Set ERFSLEEP awaked:%d ms\n",
-                          jiffies_to_msecs(jiffies -
-                                           ppsc->last_awake_jiffies)));
+                         "Set ERFSLEEP awaked:%d ms\n",
+                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
                 ppsc->last_sleep_jiffies = jiffies;
                 _rtl92c_phy_set_rf_sleep(hw);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
index ff81a61729d7..42b068660483 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h b/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
index 7f1be614c998..8b81465c629b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/reg.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
index 1e851aae58db..780c0d98a836 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.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
@@ -56,7 +56,7 @@ void rtl92cu_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -140,26 +140,26 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
 
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
 
         tmpval = tx_agc[RF90_PATH_A] >> 8;
         if (mac->mode == WIRELESS_MODE_B)
                 tmpval = tmpval & 0xff00ffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                 RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
@@ -181,8 +181,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase0 << 8) | powerBase0;
                 *(ofdmbase + i) = powerBase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
         for (i = 0; i < 2; i++) {
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20) {
@@ -194,8 +194,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
                 *(mcsbase + i) = powerBase1;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                         ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -219,8 +219,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             [chnlgroup][index + (rf ? 8 : 0)]
                             + ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance,writeVal(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "RTK better performance,writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1)
@@ -244,32 +244,31 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                         ((index < 2) ? powerBase0[rf] :
                                         powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Realtek regulatory, 20MHz, "
-                                "writeVal(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 2:
                         writeVal = ((index < 2) ? powerBase0[rf] :
                                    powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Better regulatory,writeVal(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Better regulatory,writeVal(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 case 3:
                         chnlgroup = 0;
                         if (rtlphy->current_chan_bw ==
                             HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHzrf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 40MHzrf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht40[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht20[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -297,22 +296,22 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                             (pwr_diff_limit[2] << 16) |
                             (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
                         writeVal = customer_limit + ((index < 2) ?
                                    powerBase0[rf] : powerBase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeVal rf(%c)= 0x%x\n",
-                                 ((rf == 0) ? 'A' : 'B'), writeVal));
+                                "Customer, writeVal rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 default:
                         chnlgroup = 0;
                         writeVal = rtlphy->mcs_txpwrlevel_origoffset[chnlgroup]
                                    [index + (rf ? 8 : 0)] + ((index < 2) ?
                                    powerBase0[rf] : powerBase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("RTK better "
-                                "performance, writeValrf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeVal));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeValrf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeVal);
                         break;
                 }
                 if (rtlpriv->dm.dynamic_txhighpower_lvl ==
@@ -365,7 +364,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
                         regoffset = regoffset_b[index];
                 rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal);
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeVal));
+                        "Set 0x%x = %08x\n", regoffset, writeVal);
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                      (regoffset == RTXAGC_A_MCS15_MCS12 ||
                       regoffset == RTXAGC_B_MCS15_MCS12)) ||
@@ -482,11 +481,11 @@ static bool _rtl92c_phy_rf6052_config_parafile(struct ieee80211_hw *hw)
                 }
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!", rfpath);
                         goto phy_rf_cfg_fail;
                 }
         }
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 phy_rf_cfg_fail:
         return rtstatus;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
index 500a2094b6bb..090fd33a158d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/rf.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index 6d2ca773bbc7..82c85286ab2e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
@@ -41,7 +41,6 @@
 #include "trx.h"
 #include "led.h"
 #include "hw.h"
-#include <linux/vmalloc.h>
 #include <linux/module.h>
 
 MODULE_AUTHOR("Georgia          <georgia@realtek.com>");
@@ -54,7 +53,6 @@ MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
 static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        const struct firmware *firmware;
         int err;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -62,29 +60,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->dm.disable_framebursting = false;
         rtlpriv->dm.thermalvalue = 0;
         rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
-        rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
+
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
-        /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x4000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
-                return 1;
-        }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
+
+        pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name);
+        rtlpriv->max_fw_size = 0x4000;
+        err = request_firmware_nowait(THIS_MODULE, 1,
+                                      rtlpriv->cfg->fw_name, rtlpriv->io.dev,
+                                      GFP_KERNEL, hw, rtl_fw_cb);
+
 
         return 0;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
index 43b1177924ab..a1310abd0d54 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/table.c b/drivers/net/wireless/rtlwifi/rtl8192cu/table.c
index d57ef5e88a9e..966be519edb8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/table.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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/table.h b/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
index c3d5cd826cfa..4b020e9e30b1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/table.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index b3cc7b949992..21bc827c5fa6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
@@ -108,7 +108,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
 
         if (bwificfg) { /* for WMM */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB Chip-B & WMM Setting.....\n"));
+                         "USB Chip-B & WMM Setting.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 2;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -118,7 +118,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
                 ep_map->ep_mapping[RTL_TXQ_HI]  = 2;
         } else { /* typical setting */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB typical Setting.....\n"));
+                         "USB typical Setting.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 2;
@@ -135,7 +135,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         if (bwificfg) { /* for WMM */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB 3EP Setting for WMM.....\n"));
+                         "USB 3EP Setting for WMM.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 3;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -145,7 +145,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool  bwificfg,
                 ep_map->ep_mapping[RTL_TXQ_HI]  = 2;
         } else { /* typical setting */
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB 3EP Setting for typical.....\n"));
+                         "USB 3EP Setting for typical.....\n");
                 ep_map->ep_mapping[RTL_TXQ_BE]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_BK]  = 5;
                 ep_map->ep_mapping[RTL_TXQ_VI]  = 3;
@@ -244,8 +244,8 @@ u16 rtl8192cu_mq_to_hwq(__le16 fc, u16 mac80211_queue_index)
                 break;
         default:
                 hw_queue_index = RTL_TXQ_BE;
-                RT_ASSERT(false, ("QSLT_BE queue, skb_queue:%d\n",
-                          mac80211_queue_index));
+                RT_ASSERT(false, "QSLT_BE queue, skb_queue:%d\n",
+                          mac80211_queue_index);
                 break;
         }
 out:
@@ -270,23 +270,23 @@ static enum rtl_desc_qsel _rtl8192cu_mq_to_descq(struct ieee80211_hw *hw,
         case 0: /* VO */
                 qsel = QSLT_VO;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("VO queue, set qsel = 0x%x\n", QSLT_VO));
+                         "VO queue, set qsel = 0x%x\n", QSLT_VO);
                 break;
         case 1: /* VI */
                 qsel = QSLT_VI;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("VI queue, set qsel = 0x%x\n", QSLT_VI));
+                         "VI queue, set qsel = 0x%x\n", QSLT_VI);
                 break;
         case 3: /* BK */
                 qsel = QSLT_BK;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("BK queue, set qsel = 0x%x\n", QSLT_BK));
+                         "BK queue, set qsel = 0x%x\n", QSLT_BK);
                 break;
         case 2: /* BE */
         default:
                 qsel = QSLT_BE;
                 RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG,
-                         ("BE queue, set qsel = 0x%x\n", QSLT_BE));
+                         "BE queue, set qsel = 0x%x\n", QSLT_BE);
                 break;
         }
 out:
@@ -422,17 +422,17 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb)
         bv = ieee80211_is_probe_resp(fc);
         if (bv)
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Got probe response frame.\n"));
+                         "Got probe response frame\n");
         if (ieee80211_is_beacon(fc))
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("Got beacon frame.\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got beacon frame\n");
         if (ieee80211_is_data(fc))
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Got data frame.\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got data frame\n");
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:"
-                 "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1],
-                 (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4],
-                 (u32)hdr->addr1[5]));
+                 "Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X\n",
+                 fc,
+                 (u32)hdr->addr1[0], (u32)hdr->addr1[1],
+                 (u32)hdr->addr1[2], (u32)hdr->addr1[3],
+                 (u32)hdr->addr1[4], (u32)hdr->addr1[5]);
         memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status));
         ieee80211_rx_irqsafe(hw, skb);
 }
@@ -594,7 +594,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
         if (ieee80211_is_data_qos(fc)) {
                 if (mac->rdg_en) {
                         RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                 ("Enable RDG function.\n"));
+                                 "Enable RDG function\n");
                         SET_TX_DESC_RDG_ENABLE(txdesc, 1);
                         SET_TX_DESC_HTC(txdesc, 1);
                 }
@@ -620,7 +620,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_BMC(txdesc, 1);
         _rtl_fill_usb_tx_desc(txdesc);
         _rtl_tx_desc_checksum(txdesc);
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, (" %s ==>\n", __func__));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "==>\n");
 }
 
 void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc,
@@ -677,7 +677,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
                 SET_TX_DESC_HWSEQ_EN(pdesc, 1);
                 SET_TX_DESC_PKT_ID(pdesc, 8);
         }
-        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD, "H2C Tx Cmd Content\n",
+        RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD, "H2C Tx Cmd Content",
                       pdesc, RTL_TX_DESC_SIZE);
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
index 53de5f66e242..332b06e78b00 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/def.h b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
index 946304771748..eafdf76ed64d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/def.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 3cd0736fe8e1..181ed6fc90e6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.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
@@ -246,23 +246,21 @@ static void rtl92d_dm_false_alarm_counter_statistics(struct ieee80211_hw *hw)
                 rtl_set_bbreg(hw, RCCK0_FALSEALARMREPORT, 0x0000c000, 2);
                 rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
         }
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Cnt_Fast_Fsync_fail = %x, "
-                 "Cnt_SB_Search_fail = %x\n",
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "Cnt_Fast_Fsync_fail = %x, Cnt_SB_Search_fail = %x\n",
                  falsealm_cnt->cnt_fast_fsync_fail,
-                 falsealm_cnt->cnt_sb_search_fail));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Cnt_Parity_Fail = %x, "
-                 "Cnt_Rate_Illegal = %x, Cnt_Crc8_fail = %x, "
-                 "Cnt_Mcs_fail = %x\n",
+                 falsealm_cnt->cnt_sb_search_fail);
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "Cnt_Parity_Fail = %x, Cnt_Rate_Illegal = %x, Cnt_Crc8_fail = %x, Cnt_Mcs_fail = %x\n",
                  falsealm_cnt->cnt_parity_fail,
                  falsealm_cnt->cnt_rate_illegal,
                  falsealm_cnt->cnt_crc8_fail,
-                 falsealm_cnt->cnt_mcs_fail));
+                 falsealm_cnt->cnt_mcs_fail);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("Cnt_Ofdm_fail = %x, " "Cnt_Cck_fail = %x, "
-                 "Cnt_all = %x\n",
+                 "Cnt_Ofdm_fail = %x, Cnt_Cck_fail = %x, Cnt_all = %x\n",
                  falsealm_cnt->cnt_ofdm_fail,
                  falsealm_cnt->cnt_cck_fail,
-                 falsealm_cnt->cnt_all));
+                 falsealm_cnt->cnt_all);
 }
 
 static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
@@ -275,7 +273,7 @@ static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
             (rtlpriv->dm.UNDEC_SM_PWDB == 0)) {
                 de_digtable.min_undecorated_pwdb_for_dm = 0;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
         }
         if (mac->link_state >= MAC80211_LINKED) {
                 if (mac->opmode == NL80211_IFTYPE_AP ||
@@ -283,25 +281,25 @@ static void rtl92d_dm_find_minimum_rssi(struct ieee80211_hw *hw)
                         de_digtable.min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.UNDEC_SM_PWDB;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  rtlpriv->dm.UNDEC_SM_PWDB));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 rtlpriv->dm.UNDEC_SM_PWDB);
                 } else {
                         de_digtable.min_undecorated_pwdb_for_dm =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%x\n",
-                                  de_digtable.min_undecorated_pwdb_for_dm));
+                                 "STA Default Port PWDB = 0x%x\n",
+                                 de_digtable.min_undecorated_pwdb_for_dm);
                 }
         } else {
                 de_digtable.min_undecorated_pwdb_for_dm =
                     rtlpriv->dm.UNDEC_SM_PWDB;
                 RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
-                         ("AP Ext Port or disconnet PWDB = 0x%x\n",
-                          de_digtable.min_undecorated_pwdb_for_dm));
+                         "AP Ext Port or disconnet PWDB = 0x%x\n",
+                         de_digtable.min_undecorated_pwdb_for_dm);
         }
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("MinUndecoratedPWDBForDM =%d\n",
-                        de_digtable.min_undecorated_pwdb_for_dm));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
+                 de_digtable.min_undecorated_pwdb_for_dm);
 }
 
 static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
@@ -340,14 +338,14 @@ static void rtl92d_dm_cck_packet_detection_thresh(struct ieee80211_hw *hw)
                 }
                 de_digtable.pre_cck_pd_state = de_digtable.cur_cck_pd_state;
         }
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("CurSTAConnectState=%s\n",
-                 (de_digtable.cursta_connectctate == DIG_STA_CONNECT ?
-                 "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT")));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("CCKPDStage=%s\n",
-                 (de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
-                 "Low RSSI " : "High RSSI ")));
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("is92d single phy =%x\n",
-                 IS_92D_SINGLEPHY(rtlpriv->rtlhal.version)));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CurSTAConnectState=%s\n",
+                 de_digtable.cursta_connectctate == DIG_STA_CONNECT ?
+                 "DIG_STA_CONNECT " : "DIG_STA_DISCONNECT");
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "CCKPDStage=%s\n",
+                 de_digtable.cur_cck_pd_state == CCK_PD_STAGE_LOWRSSI ?
+                 "Low RSSI " : "High RSSI ");
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "is92d single phy =%x\n",
+                 IS_92D_SINGLEPHY(rtlpriv->rtlhal.version));
 
 }
 
@@ -355,12 +353,12 @@ void rtl92d_dm_write_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("cur_igvalue = 0x%x, "
-                 "pre_igvalue = 0x%x, backoff_val = %d\n",
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+                 "cur_igvalue = 0x%x, pre_igvalue = 0x%x, backoff_val = %d\n",
                  de_digtable.cur_igvalue, de_digtable.pre_igvalue,
-                 de_digtable.backoff_val));
+                 de_digtable.backoff_val);
         if (de_digtable.dig_enable_flag == false) {
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("DIG is disabled\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "DIG is disabled\n");
                 de_digtable.pre_igvalue = 0x17;
                 return;
         }
@@ -377,22 +375,21 @@ static void rtl92d_early_mode_enabled(struct rtl_priv *rtlpriv)
 {
         if ((rtlpriv->mac80211.link_state >= MAC80211_LINKED) &&
             (rtlpriv->mac80211.vendor == PEER_CISCO)) {
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                         ("IOT_PEER = CISCO\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "IOT_PEER = CISCO\n");
                 if (de_digtable.last_min_undecorated_pwdb_for_dm >= 50
                     && de_digtable.min_undecorated_pwdb_for_dm < 50) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x00);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                                 ("Early Mode Off\n"));
+                                 "Early Mode Off\n");
                 } else if (de_digtable.last_min_undecorated_pwdb_for_dm <= 55 &&
                            de_digtable.min_undecorated_pwdb_for_dm > 55) {
                         rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x0f);
                         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                                 ("Early Mode On\n"));
+                                 "Early Mode On\n");
                 }
         } else if (!(rtl_read_byte(rtlpriv, REG_EARLY_MODE_CONTROL) & 0xf)) {
                 rtl_write_byte(rtlpriv, REG_EARLY_MODE_CONTROL, 0x0f);
-                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("Early Mode On\n"));
+                RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "Early Mode On\n");
         }
 }
 
@@ -402,7 +399,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         u8 value_igi = de_digtable.cur_igvalue;
         struct false_alarm_statistics *falsealm_cnt = &(rtlpriv->falsealm_cnt);
 
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "==>\n");
         if (rtlpriv->rtlhal.earlymode_enable) {
                 rtl92d_early_mode_enabled(rtlpriv);
                 de_digtable.last_min_undecorated_pwdb_for_dm =
@@ -421,7 +418,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         /* Not STA mode return tmp */
         if (rtlpriv->mac80211.opmode != NL80211_IFTYPE_STATION)
                 return;
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("progress\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "progress\n");
         /* Decide the current status and if modify initial gain or not */
         if (rtlpriv->mac80211.link_state >= MAC80211_LINKED)
                 de_digtable.cursta_connectctate = DIG_STA_CONNECT;
@@ -438,16 +435,16 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         else if (falsealm_cnt->cnt_all >= DM_DIG_FA_TH2)
                 value_igi += 2;
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
-                 de_digtable.large_fa_hit, de_digtable.forbidden_igi));
+                 "dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
+                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min));
+                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
+                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
 
         /* deal with abnorally large false alarm */
         if (falsealm_cnt->cnt_all > 10000) {
                 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                         ("dm_DIG(): Abnornally false alarm case.\n"));
+                         "dm_DIG(): Abnormally false alarm case\n");
 
                 de_digtable.large_fa_hit++;
                 if (de_digtable.forbidden_igi < de_digtable.cur_igvalue) {
@@ -486,11 +483,11 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                 }
         }
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
-                  de_digtable.large_fa_hit, de_digtable.forbidden_igi));
+                 "dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
+                 de_digtable.large_fa_hit, de_digtable.forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 ("dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
-                  de_digtable.recover_cnt, de_digtable.rx_gain_range_min));
+                 "dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
+                 de_digtable.recover_cnt, de_digtable.rx_gain_range_min);
 
         if (value_igi > DM_DIG_MAX)
                 value_igi = DM_DIG_MAX;
@@ -500,7 +497,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
         rtl92d_dm_write_dig(hw);
         if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G)
                 rtl92d_dm_cck_packet_detection_thresh(hw);
-        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, ("<<==\n"));
+        RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "<<==\n");
 }
 
 static void rtl92d_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
@@ -528,7 +525,7 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.UNDEC_SM_PWDB == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
                 rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
                 rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
                 return;
@@ -538,40 +535,40 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.UNDEC_SM_PWDB;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("IBSS Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "IBSS Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.UNDEC_SM_PWDB;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
         if (rtlhal->current_bandtype == BAND_ON_5G) {
                 if (undecorated_smoothed_pwdb >= 0x33) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL2;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Level2 (TxPwr=0x0)\n"));
+                                 "5G:TxHighPwrLevel_Level2 (TxPwr=0x0)\n");
                 } else if ((undecorated_smoothed_pwdb < 0x33)
                            && (undecorated_smoothed_pwdb >= 0x2b)) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL1;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Level1 (TxPwr=0x10)\n"));
+                                 "5G:TxHighPwrLevel_Level1 (TxPwr=0x10)\n");
                 } else if (undecorated_smoothed_pwdb < 0x2b) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_NORMAL;
                         RT_TRACE(rtlpriv, COMP_HIPWR, DBG_LOUD,
-                                 ("5G:TxHighPwrLevel_Normal\n"));
+                                 "5G:TxHighPwrLevel_Normal\n");
                 }
         } else {
                 if (undecorated_smoothed_pwdb >=
@@ -579,7 +576,7 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL2;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n"));
+                                 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x0)\n");
                 } else
                     if ((undecorated_smoothed_pwdb <
                          (TX_POWER_NEAR_FIELD_THRESH_LVL2 - 3))
@@ -589,19 +586,19 @@ static void rtl92d_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_LEVEL1;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n"));
+                                 "TXHIGHPWRLEVEL_LEVEL1 (TxPwr=0x10)\n");
                 } else if (undecorated_smoothed_pwdb <
                            (TX_POWER_NEAR_FIELD_THRESH_LVL1 - 5)) {
                         rtlpriv->dm.dynamic_txhighpower_lvl =
                                                  TXHIGHPWRLEVEL_NORMAL;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("TXHIGHPWRLEVEL_NORMAL\n"));
+                                 "TXHIGHPWRLEVEL_NORMAL\n");
                 }
         }
         if ((rtlpriv->dm.dynamic_txhighpower_lvl != rtlpriv->dm.last_dtp_lvl)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("PHY_SetTxPowerLevel8192S() Channel = %d\n",
-                          rtlphy->current_channel));
+                         "PHY_SetTxPowerLevel8192S() Channel = %d\n",
+                         rtlphy->current_channel);
                 rtl92d_phy_set_txpower_level(hw, rtlphy->current_channel);
         }
         rtlpriv->dm.last_dtp_lvl = rtlpriv->dm.dynamic_txhighpower_lvl;
@@ -717,7 +714,7 @@ static void rtl92d_dm_rxgain_tracking_thermalmeter(struct ieee80211_hw *hw)
         u4tmp = (index_mapping[(rtlpriv->efuse.eeprom_thermalmeter -
                                 rtlpriv->dm.thermalvalue_rxgain)]) << 12;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("===> Rx Gain %x\n", u4tmp));
+                 "===> Rx Gain %x\n", u4tmp);
         for (i = RF90_PATH_A; i < rtlpriv->phy.num_total_rfpath; i++)
                 rtl_set_rfreg(hw, i, 0x3C, BRFREGOFFSETMASK,
                               (rtlpriv->phy.reg_rf3c[i] & (~(0xF000))) | u4tmp);
@@ -741,27 +738,22 @@ static void rtl92d_bandtype_2_4G(struct ieee80211_hw *hw, long *temp_cckg,
                         if (!memcmp((void *)&temp_cck,
                             (void *)&cckswing_table_ch14[i][2], 4)) {
                                 *cck_index_old = (u8) i;
-                                RT_TRACE(rtlpriv,
-                                         COMP_POWER_TRACKING,
-                                         DBG_LOUD,
-                                         ("Initial reg0x%x = 0x%lx, "
-                                          "cck_index=0x%x, ch 14 %d\n",
-                                          RCCK0_TXFILTER2,
-                                          temp_cck, *cck_index_old,
-                                          rtlpriv->dm.cck_inch14));
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index=0x%x, ch 14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         *cck_index_old,
+                                         rtlpriv->dm.cck_inch14);
                                 break;
                         }
                 } else {
                         if (!memcmp((void *) &temp_cck,
                             &cckswing_table_ch1ch13[i][2], 4)) {
                                 *cck_index_old = (u8) i;
-                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
-                                         DBG_LOUD,
-                                         ("Initial reg0x%x = 0x%lx, "
-                                         "cck_index = 0x%x, ch14 %d\n",
-                                         RCCK0_TXFILTER2,
-                                         temp_cck, *cck_index_old,
-                                         rtlpriv->dm.cck_inch14));
+                                RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+                                         "Initial reg0x%x = 0x%lx, cck_index = 0x%x, ch14 %d\n",
+                                         RCCK0_TXFILTER2, temp_cck,
+                                         *cck_index_old,
+                                         rtlpriv->dm.cck_inch14);
                                 break;
                         }
                 }
@@ -884,12 +876,12 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
         };
 
         rtlpriv->dm.txpower_trackinginit = true;
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "\n");
         thermalvalue = (u8) rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0xf800);
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                 "eeprom_thermalmeter 0x%x\n", thermalvalue,
-                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x\n",
+                 thermalvalue,
+                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
         rtl92d_phy_ap_calibrate(hw, (thermalvalue -
                                      rtlefuse->eeprom_thermalmeter));
         if (is2t)
@@ -904,10 +896,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                 ofdm_index_old[0] = (u8) i;
 
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("Initial pathA ele_d reg0x%x = 0x%lx,"
-                                         " ofdm_index=0x%x\n",
+                                         "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index=0x%x\n",
                                          ROFDM0_XATxIQIMBALANCE,
-                                         ele_d, ofdm_index_old[0]));
+                                         ele_d, ofdm_index_old[0]);
                                 break;
                         }
                 }
@@ -920,11 +911,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                         ofdm_index_old[1] = (u8) i;
                                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING,
                                                  DBG_LOUD,
-                                                 ("Initial pathB ele_d reg "
-                                                 "0x%x = 0x%lx, ofdm_index "
-                                                 "= 0x%x\n",
+                                                 "Initial pathB ele_d reg 0x%x = 0x%lx, ofdm_index = 0x%x\n",
                                                  ROFDM0_XBTxIQIMBALANCE, ele_d,
-                                                 ofdm_index_old[1]));
+                                                 ofdm_index_old[1]);
                                         break;
                                 }
                         }
@@ -952,7 +941,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                 rtlpriv->dm.ofdm_index[i] = ofdm_index_old[i];
                         rtlpriv->dm.cck_index = cck_index_old;
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("reload ofdm index for band switch\n"));
+                                 "reload ofdm index for band switch\n");
                 }
                 rtlpriv->dm.thermalvalue_avg
                             [rtlpriv->dm.thermalvalue_avg_index] = thermalvalue;
@@ -995,12 +984,10 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         (thermalvalue - rtlpriv->dm.thermalvalue_rxgain) :
                         (rtlpriv->dm.thermalvalue_rxgain - thermalvalue);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x"
-                          " eeprom_thermalmeter 0x%x delta 0x%x "
-                          "delta_lck 0x%x delta_iqk 0x%x\n",
-                          thermalvalue, rtlpriv->dm.thermalvalue,
-                          rtlefuse->eeprom_thermalmeter, delta, delta_lck,
-                          delta_iqk));
+                         "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermalmeter 0x%x delta 0x%x delta_lck 0x%x delta_iqk 0x%x\n",
+                         thermalvalue, rtlpriv->dm.thermalvalue,
+                         rtlefuse->eeprom_thermalmeter, delta, delta_lck,
+                         delta_iqk);
                 if ((delta_lck > rtlefuse->delta_lck) &&
                     (rtlefuse->delta_lck != 0)) {
                         rtlpriv->dm.thermalvalue_lck = thermalvalue;
@@ -1036,17 +1023,15 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x, OFDM_B_index"
-                                         " = 0x%x,cck_index=0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                          rtlpriv->dm.ofdm_index[1],
-                                          rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x, OFDM_B_index = 0x%x,cck_index=0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.ofdm_index[1],
+                                         rtlpriv->dm.cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("temp OFDM_A_index=0x%x,cck_index = "
-                                         "0x%x\n",
-                                          rtlpriv->dm.ofdm_index[0],
-                                                        rtlpriv->dm.cck_index));
+                                         "temp OFDM_A_index=0x%x,cck_index = 0x%x\n",
+                                         rtlpriv->dm.ofdm_index[0],
+                                         rtlpriv->dm.cck_index);
                         }
                         for (i = 0; i < rf; i++) {
                                 if (ofdm_index[i] > OFDM_TABLE_SIZE_92D - 1)
@@ -1070,15 +1055,13 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         if (is2t) {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x, OFDM_B_index "
-                                         "= 0x%x, cck_index=0x%x\n",
+                                         "new OFDM_A_index=0x%x, OFDM_B_index = 0x%x, cck_index=0x%x\n",
                                          ofdm_index[0], ofdm_index[1],
-                                         cck_index));
+                                         cck_index);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("new OFDM_A_index=0x%x,cck_index = "
-                                         "0x%x\n",
-                                          ofdm_index[0], cck_index));
+                                         "new OFDM_A_index=0x%x,cck_index = 0x%x\n",
+                                         ofdm_index[0], cck_index);
                         }
                         ele_d = (ofdmswing_table[(u8) ofdm_index[0]] &
                                                  0xFFC00000) >> 22;
@@ -1124,12 +1107,10 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("TxPwrTracking for interface %d path A: X ="
-                                 " 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = "
-                                 "0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = "
-                                 "0x%lx\n", rtlhal->interfaceindex,
+                                 "TxPwrTracking for interface %d path A: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xe94 = 0x%lx 0xe9c = 0x%lx\n",
+                                 rtlhal->interfaceindex,
                                  val_x, val_y, ele_a, ele_c, ele_d,
-                                 val_x, val_y));
+                                 val_x, val_y);
 
                         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                                 /* Adjust CCK according to IQK result */
@@ -1232,20 +1213,16 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                                                       BIT(28), 0x00);
                                 }
                                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                         ("TxPwrTracking path B: X = 0x%lx, "
-                                         "Y = 0x%lx ele_A = 0x%lx ele_C = 0x"
-                                         "%lx ele_D = 0x%lx 0xeb4 = 0x%lx "
-                                         "0xebc = 0x%lx\n",
-                                          val_x, val_y, ele_a, ele_c,
-                                          ele_d, val_x, val_y));
+                                         "TxPwrTracking path B: X = 0x%lx, Y = 0x%lx ele_A = 0x%lx ele_C = 0x%lx ele_D = 0x%lx 0xeb4 = 0x%lx 0xebc = 0x%lx\n",
+                                         val_x, val_y, ele_a, ele_c,
+                                         ele_d, val_x, val_y);
                         }
                         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                                 ("TxPwrTracking 0xc80 = 0x%x, 0xc94 = "
-                                 "0x%x RF 0x24 = 0x%x\n",
+                                 "TxPwrTracking 0xc80 = 0x%x, 0xc94 = 0x%x RF 0x24 = 0x%x\n",
                                  rtl_get_bbreg(hw, 0xc80, BMASKDWORD),
                                  rtl_get_bbreg(hw, 0xc94, BMASKDWORD),
                                  rtl_get_rfreg(hw, RF90_PATH_A, 0x24,
-                                 BRFREGOFFSETMASK)));
+                                               BRFREGOFFSETMASK));
                 }
                 if ((delta_iqk > rtlefuse->delta_iqk) &&
                     (rtlefuse->delta_iqk != 0)) {
@@ -1262,7 +1239,7 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         rtlpriv->dm.thermalvalue = thermalvalue;
         }
 
-        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, "<===\n");
 }
 
 static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1273,8 +1250,8 @@ static void rtl92d_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
         rtlpriv->dm.txpower_trackinginit = false;
         rtlpriv->dm.txpower_track_control = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("pMgntInfo->txpower_tracking = %d\n",
-                 rtlpriv->dm.txpower_tracking));
+                 "pMgntInfo->txpower_tracking = %d\n",
+                 rtlpriv->dm.txpower_tracking);
 }
 
 void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)
@@ -1289,12 +1266,12 @@ void rtl92d_dm_check_txpower_tracking_thermal_meter(struct ieee80211_hw *hw)
                 rtl_set_rfreg(hw, RF90_PATH_A, RF_T_METER, BIT(17) |
                               BIT(16), 0x03);
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Trigger 92S Thermal Meter!!\n"));
+                         "Trigger 92S Thermal Meter!!\n");
                 tm_trigger = 1;
                 return;
         } else {
                 RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                         ("Schedule TxPowerTracking direct call!!\n"));
+                         "Schedule TxPowerTracking direct call!!\n");
                 rtl92d_dm_txpower_tracking_callback_thermalmeter(hw);
                 tm_trigger = 0;
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
index 69354657f0f5..91030ec8ac3e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index 82f060bdbc0b..f548a8d0068d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.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
@@ -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);
@@ -186,9 +186,9 @@ void rtl92d_firmware_selfreset(struct ieee80211_hw *hw)
                 udelay(50);
                 u1b_tmp = rtl_read_byte(rtlpriv, REG_SYS_FUNC_EN + 1);
         }
-        RT_ASSERT((delay > 0), ("8051 reset failed!\n"));
+        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;
 }
 
@@ -257,20 +253,20 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         bool fw_downloaded = false, fwdl_in_process = false;
         unsigned long flags;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
         fwsize = rtlhal->fwsize;
         pfwheader = (u8 *) rtlhal->pfirmware;
         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,26 +520,20 @@ 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,
                          u8 element_id, u32 cmd_len, u8 *cmdbuffer)
 {
-        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u32 tmp_cmdbuf[2];
 
-        if (rtlhal->fw_ready == false) {
-                RT_ASSERT(false, ("return H2C cmd because of Fw "
-                                  "download fail!!!\n"));
-                return;
-        }
         memset(tmp_cmdbuf, 0, 8);
         memcpy(tmp_cmdbuf, cmdbuffer, cmd_len);
         _rtl92d_fill_h2c_command(hw, element_id, cmd_len, (u8 *)&tmp_cmdbuf);
@@ -559,13 +546,13 @@ 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,
                                               ppsc->reg_max_lps_awakeintvl);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92d_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",
                       u1_h2c_set_pwrmode, 3);
         rtl92d_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
 }
@@ -757,28 +744,32 @@ void rtl92d_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished)
         SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(u1RsvdPageLoc, PROBERSP_PG);
         totalpacketlen = TOTAL_RESERVED_PKT_LEN;
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       &reserved_page_packet[0], totalpacketlen);
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,
-                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",
+                      "rtl92d_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",
                       u1RsvdPageLoc, 3);
         skb = dev_alloc_skb(totalpacketlen);
-        memcpy((u8 *) skb_put(skb, totalpacketlen), &reserved_page_packet,
-                totalpacketlen);
-        rtstatus = _rtl92d_cmd_send_packet(hw, skb);
+        if (!skb) {
+                dlok = false;
+        } else {
+                memcpy((u8 *) skb_put(skb, totalpacketlen),
+                        &reserved_page_packet, totalpacketlen);
+                rtstatus = _rtl92d_cmd_send_packet(hw, skb);
 
-        if (rtstatus)
-                dlok = true;
+                if (rtstatus)
+                        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:\n", u1RsvdPageLoc, 3);
+                              "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)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
index 0c4d489eaa48..1ffacdda734c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 9d89d7ccdafb..7d877125db29 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.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
@@ -166,7 +166,7 @@ void rtl92de_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -230,7 +230,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 e_aci;
 
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                         "HW_VAR_SLOT_TIME %x\n", val[0]);
                 rtl_write_byte(rtlpriv, REG_SLOT, val[0]);
                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -261,8 +261,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                               min_spacing_to_set);
                         *val = min_spacing_to_set;
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                 mac->min_space_cfg));
+                                 "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                 mac->min_space_cfg);
                         rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
                 }
@@ -275,8 +275,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                 mac->min_space_cfg |= (density_to_set << 3);
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                         ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                         mac->min_space_cfg));
+                         "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                         mac->min_space_cfg);
                 rtl_write_byte(rtlpriv, REG_AMPDU_MIN_SPACE,
                                mac->min_space_cfg);
                 break;
@@ -310,8 +310,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         }
                         rtl_write_dword(rtlpriv, REG_AGGLEN_LMT, regtoSet);
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                 factor_toset));
+                                 "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                 factor_toset);
                 }
                 break;
         }
@@ -344,8 +344,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("HW_VAR_ACM_CTRL acm set "
-                                         "failed: eACI is %d\n", acm));
+                                         "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                         acm);
                                 break;
                         }
                 } else {
@@ -361,13 +361,13 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 break;
                         default:
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                         ("switch case not process\n"));
+                                         "switch case not processed\n");
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                         ("SetHwReg8190pci(): [HW_VAR_ACM_CTRL] "
-                         "Write 0x%X\n", acm_ctrl));
+                         "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n",
+                         acm_ctrl);
                 rtl_write_byte(rtlpriv, REG_ACMHWCTRL, acm_ctrl);
                 break;
         }
@@ -502,7 +502,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 }
@@ -522,8 +522,8 @@ static bool _rtl92de_llt_write(struct ieee80211_hw *hw, u32 address, u32 data)
                         break;
                 if (count > POLLING_LLT_THRESHOLD) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Failed to polling write LLT done at "
-                                  "address %d!\n", address));
+                                 "Failed to polling write LLT done at address %d!\n",
+                                 address);
                         status = false;
                         break;
                 }
@@ -879,12 +879,12 @@ void rtl92de_enable_hw_security_config(struct ieee80211_hw *hw)
         u8 sec_reg_value;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
-                  rtlpriv->sec.pairwise_enc_algorithm,
-                  rtlpriv->sec.group_enc_algorithm));
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
+                 rtlpriv->sec.pairwise_enc_algorithm,
+                 rtlpriv->sec.group_enc_algorithm);
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return;
         }
         sec_reg_value = SCR_TXENCENABLE | SCR_RXENCENABLE;
@@ -895,7 +895,7 @@ void rtl92de_enable_hw_security_config(struct ieee80211_hw *hw)
         sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
         rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                 ("The SECR-value %x\n", sec_reg_value));
+                 "The SECR-value %x\n", sec_reg_value);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 }
 
@@ -921,7 +921,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
         /* rtlpriv->intf_ops->disable_aspm(hw); */
         rtstatus = _rtl92de_init_mac(hw);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Init MAC failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
                 err = 1;
                 spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);
                 return err;
@@ -930,12 +930,8 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
         spin_unlock_irqrestore(&globalmutex_for_power_and_efuse, flags);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. Init HW "
-                         "without FW..\n"));
-                rtlhal->fw_ready = false;
+                         "Failed to download FW. Init HW without FW..\n");
                 return 1;
-        } else {
-                rtlhal->fw_ready = true;
         }
         rtlhal->last_hmeboxnum = 0;
         rtlpriv->psc.fw_current_inpsmode = false;
@@ -946,7 +942,7 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
 
         if (rtlhal->earlymode_enable) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("EarlyMode Enabled!!!\n"));
+                         "EarlyMode Enabled!!!\n");
 
                 tmp_u1b = rtl_read_byte(rtlpriv, 0x4d0);
                 tmp_u1b = tmp_u1b | 0x1f;
@@ -1064,10 +1060,10 @@ static enum version_8192d _rtl92de_read_chip_version(struct ieee80211_hw *hw)
         value32 = rtl_read_dword(rtlpriv, REG_SYS_CFG);
         if (!(value32 & 0x000f0000)) {
                 version = VERSION_TEST_CHIP_92D_SINGLEPHY;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("TEST CHIP!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "TEST CHIP!!!\n");
         } else {
                 version = VERSION_NORMAL_CHIP_92D_SINGLEPHY;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Normal CHIP!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Normal CHIP!!!\n");
         }
         return version;
 }
@@ -1092,8 +1088,8 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
                 _rtl92de_disable_bcn_sub_func(hw);
         } else {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Set HW_VAR_MEDIA_STATUS: No such media "
-                         "status(%x).\n", type));
+                         "Set HW_VAR_MEDIA_STATUS: No such media status(%x)\n",
+                         type);
         }
         bcnfunc_enable = rtl_read_byte(rtlpriv, REG_BCN_CTRL);
         switch (type) {
@@ -1102,30 +1098,30 @@ static int _rtl92de_set_media_status(struct ieee80211_hw *hw,
                 ledaction = LED_CTL_LINK;
                 bcnfunc_enable &= 0xF7;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= MSR_ADHOC;
                 bcnfunc_enable |= 0x08;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= MSR_INFRA;
                 ledaction = LED_CTL_LINK;
                 bcnfunc_enable &= 0xF7;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= MSR_AP;
                 bcnfunc_enable |= 0x08;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1189,7 +1185,7 @@ void rtl92d_linked_set_reg(struct ieee80211_hw *hw)
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
         if (!rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done) {
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_DMESG,
-                                ("Do IQK for channel:%d.\n", channel));
+                         "Do IQK for channel:%d\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
         }
 }
@@ -1214,7 +1210,7 @@ void rtl92de_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, REG_EDCA_VO_PARAM, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1305,8 +1301,8 @@ static void _rtl92de_poweroff_adapter(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_APS_FSMCO + 1, 0x10);
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("In PowerOff,reg0x%x=%X\n", REG_SPS0_CTRL,
-                  rtl_read_byte(rtlpriv, REG_SPS0_CTRL)));
+                 "In PowerOff,reg0x%x=%X\n",
+                 REG_SPS0_CTRL, rtl_read_byte(rtlpriv, REG_SPS0_CTRL));
         /* r.   Note: for PCIe interface, PON will not turn */
         /* off m-bias and BandGap in PCIe suspend mode.  */
 
@@ -1319,7 +1315,7 @@ static void _rtl92de_poweroff_adapter(struct ieee80211_hw *hw)
                 spin_unlock_irqrestore(&globalmutex_power, flags);
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<=======\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<=======\n");
 }
 
 void rtl92de_card_disable(struct ieee80211_hw *hw)
@@ -1377,7 +1373,7 @@ void rtl92de_card_disable(struct ieee80211_hw *hw)
         rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG + 1, 0xff);
         udelay(50);
         rtl_write_byte(rtlpriv, REG_CR, 0x0);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==> Do power off.......\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==> Do power off.......\n");
         if (rtl92d_phy_check_poweroff(hw))
                 _rtl92de_poweroff_adapter(hw);
         return;
@@ -1425,7 +1421,7 @@ void rtl92de_set_beacon_interval(struct ieee80211_hw *hw)
         u16 bcn_interval = mac->beacon_interval;
 
         RT_TRACE(rtlpriv, COMP_BEACON, DBG_DMESG,
-                 ("beacon_interval:%d\n", bcn_interval));
+                 "beacon_interval:%d\n", bcn_interval);
         /* rtl92de_disable_interrupt(hw); */
         rtl_write_word(rtlpriv, REG_BCN_INTERVAL, bcn_interval);
         /* rtl92de_enable_interrupt(hw); */
@@ -1437,8 +1433,8 @@ void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
         if (rm_msr)
@@ -1615,9 +1611,9 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
                         rtlefuse->internal_pa_5g[1] =
                                 !((hwinfo[EEPROM_TSSI_B_5G] & BIT(6)) >> 6);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Is D cut,Internal PA0 %d Internal PA1 %d\n",
+                                 "Is D cut,Internal PA0 %d Internal PA1 %d\n",
                                  rtlefuse->internal_pa_5g[0],
-                                 rtlefuse->internal_pa_5g[1]))
+                                 rtlefuse->internal_pa_5g[1]);
                 }
                 rtlefuse->eeprom_c9 = hwinfo[EEPROM_RF_OPT6];
                 rtlefuse->eeprom_cc = hwinfo[EEPROM_RF_OPT7];
@@ -1667,14 +1663,14 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw,
         if (rtlefuse->eeprom_c9 == 0xFF)
                 rtlefuse->eeprom_c9 = 0x00;
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("EEPROMRegulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                 "EEPROMRegulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("ThermalMeter = 0x%x\n", rtlefuse->eeprom_thermalmeter));
+                 "ThermalMeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("CrystalCap = 0x%x\n", rtlefuse->crystalcap));
+                 "CrystalCap = 0x%x\n", rtlefuse->crystalcap);
         RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("Delta_IQK = 0x%x Delta_LCK = 0x%x\n", rtlefuse->delta_iqk,
-                 rtlefuse->delta_lck));
+                 "Delta_IQK = 0x%x Delta_LCK = 0x%x\n",
+                 rtlefuse->delta_iqk, rtlefuse->delta_lck);
 
         for (rfPath = 0; rfPath < RF6052_MAX_PATH; rfPath++) {
                 for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
@@ -1710,11 +1706,11 @@ static void _rtl92de_read_macphymode_from_prom(struct ieee80211_hw *hw,
         if (macphy_crvalue & BIT(3)) {
                 rtlhal->macphymode = SINGLEMAC_SINGLEPHY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode SINGLEMAC_SINGLEPHY\n"));
+                         "MacPhyMode SINGLEMAC_SINGLEPHY\n");
         } else {
                 rtlhal->macphymode = DUALMAC_DUALPHY;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode DUALMAC_DUALPHY\n"));
+                         "MacPhyMode DUALMAC_DUALPHY\n");
         }
 }
 
@@ -1741,15 +1737,15 @@ static void _rtl92de_efuse_update_chip_version(struct ieee80211_hw *hw)
         switch (chipvalue) {
         case 0xAA55:
                 chipver |= CHIP_92D_C_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("C-CUT!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "C-CUT!!!\n");
                 break;
         case 0x9966:
                 chipver |= CHIP_92D_D_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("D-CUT!!!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "D-CUT!!!\n");
                 break;
         default:
                 chipver |= CHIP_92D_D_CUT;
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, ("Unkown CUT!\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unkown CUT!\n");
                 break;
         }
         rtlpriv->rtlhal.version = chipver;
@@ -1775,23 +1771,23 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
                        HWSET_MAX_SIZE);
         } else if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         }
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
         if (rtlefuse->autoload_failflag) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
                 return;
         }
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
@@ -1802,16 +1798,15 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_did = *(u16 *)&hwinfo[EEPROM_DID];
         rtlefuse->eeprom_svid = *(u16 *)&hwinfo[EEPROM_SVID];
         rtlefuse->eeprom_smid = *(u16 *)&hwinfo[EEPROM_SMID];
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROMId = 0x%4x\n", eeprom_id);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROMId = 0x%4x\n", eeprom_id));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid));
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did));
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid));
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid));
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
 
         /* Read Permanent MAC address */
         if (rtlhal->interfaceindex == 0) {
@@ -1827,8 +1822,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         }
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ETHER_ADDR,
                                       rtlefuse->dev_addr);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
         _rtl92de_read_txpower_info(hw, rtlefuse->autoload_failflag, hwinfo);
 
         /* Read Channel Plan */
@@ -1849,7 +1843,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
         rtlefuse->txpwr_fromeprom = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid));
+                 "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
 }
 
 void rtl92de_read_eeprom_info(struct ieee80211_hw *hw)
@@ -1863,19 +1857,19 @@ void rtl92de_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, REG_9346CR);
         rtlefuse->autoload_status = tmp_u1b;
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
 
                 rtlefuse->autoload_failflag = false;
                 _rtl92de_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
         }
         return;
 }
@@ -1958,8 +1952,8 @@ static void rtl92de_update_hal_rate_table(struct ieee80211_hw *hw,
                     (shortgi_rate << 4) | (shortgi_rate);
         }
         rtl_write_dword(rtlpriv, REG_ARFR0 + ratr_index * 4, ratr_value);
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, REG_ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, REG_ARFR0));
 }
 
 static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -2092,8 +2086,8 @@ static void rtl92de_update_hal_rate_mask(struct ieee80211_hw *hw,
         value[0] = (ratr_bitmap & 0x0fffffff) | (ratr_index << 28);
         value[1] = macid | (shortgi ? 0x20 : 0x00) | 0x80;
         RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("ratr_bitmap :%x value0:%x value1:%x\n",
-                  ratr_bitmap, value[0], value[1]));
+                 "ratr_bitmap :%x value0:%x value1:%x\n",
+                 ratr_bitmap, value[0], value[1]);
         rtl92d_fill_h2c_cmd(hw, H2C_RA_MASK, 5, (u8 *) value);
         if (macid != 0)
                 sta_entry->ratr_index = ratr_index;
@@ -2153,14 +2147,14 @@ bool rtl92de_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
         e_rfpowerstate_toset = (u1tmp & BIT(3)) ? ERFON : ERFOFF;
         if (ppsc->hwradiooff && (e_rfpowerstate_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio ON, RF ON\n"));
+                         "GPIOChangeRF  - HW Radio ON, RF ON\n");
                 e_rfpowerstate_toset = ERFON;
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((ppsc->hwradiooff == false)
                 && (e_rfpowerstate_toset == ERFOFF)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("GPIOChangeRF  - HW Radio OFF, RF OFF\n"));
+                         "GPIOChangeRF  - HW Radio OFF, RF OFF\n");
                 e_rfpowerstate_toset = ERFOFF;
                 ppsc->hwradiooff = true;
                 actuallyset = true;
@@ -2204,7 +2198,7 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                 u8 idx;
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
                         rtl_cam_empty_entry(hw, cam_offset + idx);
@@ -2230,8 +2224,8 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                         enc_algo = CAM_AES;
                         break;
                 default:
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("switch case "
-                                                "not process\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2248,9 +2242,8 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv, COMP_SEC,
-                                                         DBG_EMERG, ("Can not "
-                                                         "find free hw security"
-                                                         " cam entry\n"));
+                                                         DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2262,29 +2255,29 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                 }
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                              "Pairwiase Key content :",
+                                              "Pairwise Key content",
                                               rtlpriv->sec.pairwise_key,
                                               rtlpriv->
                                               sec.key_len[PAIRWISE_KEYIDX]);
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                                       entry_id, enc_algo,
                                                       CAM_CONFIG_NO_USEDK,
@@ -2292,7 +2285,7 @@ void rtl92de_set_key(struct ieee80211_hw *hw, u32 key_index,
                                                       sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
                                                 rtlefuse->dev_addr,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.h b/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
index ad44ffa520e6..7c9f7a2f1e42 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/led.c b/drivers/net/wireless/rtlwifi/rtl8192de/led.c
index f1552f4df658..76a57ae4af3e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/led.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
@@ -45,8 +45,8 @@ void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         switch (pled->ledpin) {
         case LED_PIN_GPIO0:
@@ -71,7 +71,7 @@ void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -83,8 +83,8 @@ void rtl92de_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", REG_LEDCFG2, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 REG_LEDCFG2, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, REG_LEDCFG2);
 
@@ -106,7 +106,7 @@ void rtl92de_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -153,7 +153,7 @@ void rtl92de_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
              ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n", ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d,\n", ledaction);
 
         _rtl92ce_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/led.h b/drivers/net/wireless/rtlwifi/rtl8192de/led.h
index 57f4a3c583d4..a29df30c3025 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/led.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 0883349e1c83..9581a19c2548 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.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
@@ -204,8 +204,8 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         u32 returnvalue, originalvalue, bitshift;
         u8 dbi_direct;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "bitmask(%#x)\n", regaddr, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
         if (rtlhal->during_mac1init_radioa || rtlhal->during_mac0init_radiob) {
                 /* mac1 use phy0 read radio_b. */
                 /* mac0 use phy1 read radio_b. */
@@ -220,8 +220,9 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         }
         bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("BBR MASK=0x%x "
-                "Addr[0x%x]=0x%x\n", bitmask, regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
         return returnvalue;
 }
 
@@ -233,8 +234,9 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw,
         u8 dbi_direct = 0;
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
         if (rtlhal->during_mac1init_radioa)
                 dbi_direct = BIT(3);
         else if (rtlhal->during_mac0init_radiob)
@@ -255,8 +257,9 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw,
                 rtl92de_write_dword_dbi(hw, (u16) regaddr, data, dbi_direct);
         else
                 rtl_write_dword(rtlpriv, regaddr, data);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                 " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 }
 
 static u32 _rtl92d_phy_rf_serial_read(struct ieee80211_hw *hw,
@@ -300,8 +303,8 @@ static u32 _rtl92d_phy_rf_serial_read(struct ieee80211_hw *hw,
         else
                 retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                         BLSSIREADBACKDATA);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x] = 0x%x\n",
-                 rfpath, pphyreg->rflssi_readback, retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x] = 0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
         return retvalue;
 }
 
@@ -319,8 +322,8 @@ static void _rtl92d_phy_rf_serial_write(struct ieee80211_hw *hw,
         /* T65 RF */
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, BMASKDWORD, data_and_addr);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                rfpath, pphyreg->rf3wire_offset, data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 
 u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
@@ -330,17 +333,17 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw,
         u32 original_value, readback_value, bitshift;
         unsigned long flags;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "rfpath(%#x), bitmask(%#x)\n",
-                regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
         original_value = _rtl92d_phy_rf_serial_read(hw, rfpath, regaddr);
         bitshift = _rtl92d_phy_calculate_bit_shift(bitmask);
         readback_value = (original_value & bitmask) >> bitshift;
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                "bitmask(%#x), original_value(%#x)\n",
-                regaddr, rfpath, bitmask, original_value));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
         return readback_value;
 }
 
@@ -353,8 +356,8 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         unsigned long flags;
 
         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath));
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
         if (bitmask == 0)
                 return;
         spin_lock_irqsave(&rtlpriv->locks.rf_lock, flags);
@@ -369,9 +372,9 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
                 _rtl92d_phy_rf_serial_write(hw, rfpath, regaddr, data);
         }
         spin_unlock_irqrestore(&rtlpriv->locks.rf_lock, flags);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), "
-                "bitmask(%#x), data(%#x), rfpath(%#x)\n",
-                regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 }
 
 bool rtl92d_phy_mac_config(struct ieee80211_hw *hw)
@@ -381,10 +384,10 @@ bool rtl92d_phy_mac_config(struct ieee80211_hw *hw)
         u32 arraylength;
         u32 *ptrarray;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Read Rtl819XMACPHY_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
         arraylength = MAC_2T_ARRAYLENGTH;
         ptrarray = rtl8192de_mac_2tarray;
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Img:Rtl819XMAC_Array\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:Rtl819XMAC_Array\n");
         for (i = 0; i < arraylength; i = i + 2)
                 rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
         if (rtlpriv->rtlhal.macphymode == SINGLEMAC_SINGLEPHY) {
@@ -561,25 +564,25 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                 agctab_arraylen = AGCTAB_ARRAYLENGTH;
                 agctab_array_table = rtl8192de_agctab_array;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         (" ===> phy:MAC0, Rtl819XAGCTAB_Array\n"));
+                         " ===> phy:MAC0, Rtl819XAGCTAB_Array\n");
         } else {
                 if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                         agctab_arraylen = AGCTAB_2G_ARRAYLENGTH;
                         agctab_array_table = rtl8192de_agctab_2garray;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 (" ===> phy:MAC1, Rtl819XAGCTAB_2GArray\n"));
+                                 " ===> phy:MAC1, Rtl819XAGCTAB_2GArray\n");
                 } else {
                         agctab_5garraylen = AGCTAB_5G_ARRAYLENGTH;
                         agctab_5garray_table = rtl8192de_agctab_5garray;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 (" ===> phy:MAC1, Rtl819XAGCTAB_5GArray\n"));
+                                 " ===> phy:MAC1, Rtl819XAGCTAB_5GArray\n");
 
                 }
         }
         phy_reg_arraylen = PHY_REG_2T_ARRAYLENGTH;
         phy_regarray_table = rtl8192de_phy_reg_2tarray;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 (" ===> phy:Rtl819XPHY_REG_Array_PG\n"));
+                 " ===> phy:Rtl819XPHY_REG_Array_PG\n");
         if (configtype == BASEBAND_CONFIG_PHY_REG) {
                 for (i = 0; i < phy_reg_arraylen; i = i + 2) {
                         if (phy_regarray_table[i] == 0xfe)
@@ -598,10 +601,9 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                       phy_regarray_table[i + 1]);
                         udelay(1);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                 ("The phy_regarray_table[0] is %x"
-                                  " Rtl819XPHY_REGArray[1] is %x\n",
-                                  phy_regarray_table[i],
-                                  phy_regarray_table[i + 1]));
+                                 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n",
+                                 phy_regarray_table[i],
+                                 phy_regarray_table[i + 1]);
                 }
         } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                 if (rtlhal->interfaceindex == 0) {
@@ -613,15 +615,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                  * setting. */
                                 udelay(1);
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                         ("The Rtl819XAGCTAB_Array_"
-                                         "Table[0] is %ul "
-                                         "Rtl819XPHY_REGArray[1] is %ul\n",
+                                         "The Rtl819XAGCTAB_Array_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                          agctab_array_table[i],
-                                         agctab_array_table[i + 1]));
+                                         agctab_array_table[i + 1]);
                         }
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 ("Normal Chip, MAC0, load "
-                                 "Rtl819XAGCTAB_Array\n"));
+                                 "Normal Chip, MAC0, load Rtl819XAGCTAB_Array\n");
                 } else {
                         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                                 for (i = 0; i < agctab_arraylen; i = i + 2) {
@@ -632,14 +631,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                          * setting. */
                                         udelay(1);
                                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                 ("The Rtl819XAGCTAB_Array_"
-                                                 "Table[0] is %ul Rtl819XPHY_"
-                                                 "REGArray[1] is %ul\n",
+                                                 "The Rtl819XAGCTAB_Array_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                                  agctab_array_table[i],
-                                                 agctab_array_table[i + 1]));
+                                                 agctab_array_table[i + 1]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                         ("Load Rtl819XAGCTAB_2GArray\n"));
+                                         "Load Rtl819XAGCTAB_2GArray\n");
                         } else {
                                 for (i = 0; i < agctab_5garraylen; i = i + 2) {
                                         rtl_set_bbreg(hw,
@@ -650,14 +647,12 @@ static bool _rtl92d_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                          * setting. */
                                         udelay(1);
                                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                                 ("The Rtl819XAGCTAB_5GArray_"
-                                                 "Table[0] is %ul Rtl819XPHY_"
-                                                 "REGArray[1] is %ul\n",
+                                                 "The Rtl819XAGCTAB_5GArray_Table[0] is %ul Rtl819XPHY_REGArray[1] is %ul\n",
                                                  agctab_5garray_table[i],
-                                                 agctab_5garray_table[i + 1]));
+                                                 agctab_5garray_table[i + 1]);
                                 }
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                        ("Load Rtl819XAGCTAB_5GArray\n"));
+                                         "Load Rtl819XAGCTAB_5GArray\n");
                         }
                 }
         }
@@ -675,145 +670,145 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][0] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][0] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][0] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][0]));
+                         [rtlphy->pwrgroup_cnt][0]);
         }
         if (regaddr == RTXAGC_A_RATE54_24) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][1] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][1] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][1] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][1]));
+                         [rtlphy->pwrgroup_cnt][1]);
         }
         if (regaddr == RTXAGC_A_CCK1_MCS32) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][6] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][6] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][6] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][6]));
+                         [rtlphy->pwrgroup_cnt][6]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0xffffff00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][7] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][7] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][7] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][7]));
+                         [rtlphy->pwrgroup_cnt][7]);
         }
         if (regaddr == RTXAGC_A_MCS03_MCS00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][2] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][2] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][2] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][2]));
+                         [rtlphy->pwrgroup_cnt][2]);
         }
         if (regaddr == RTXAGC_A_MCS07_MCS04) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][3] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][3] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][3] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][3]));
+                         [rtlphy->pwrgroup_cnt][3]);
         }
         if (regaddr == RTXAGC_A_MCS11_MCS08) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][4] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][4] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][4] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][4]));
+                         [rtlphy->pwrgroup_cnt][4]);
         }
         if (regaddr == RTXAGC_A_MCS15_MCS12) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][5] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][5] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][5] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][5]));
+                         [rtlphy->pwrgroup_cnt][5]);
         }
         if (regaddr == RTXAGC_B_RATE18_06) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][8] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][8] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][8] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][8]));
+                         [rtlphy->pwrgroup_cnt][8]);
         }
         if (regaddr == RTXAGC_B_RATE54_24) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][9] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][9] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][9] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][9]));
+                         [rtlphy->pwrgroup_cnt][9]);
         }
         if (regaddr == RTXAGC_B_CCK1_55_MCS32) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][14] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][14] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][14] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][14]));
+                         [rtlphy->pwrgroup_cnt][14]);
         }
         if (regaddr == RTXAGC_B_CCK11_A_CCK2_11 && bitmask == 0x000000ff) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][15] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][15] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][15] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][15]));
+                         [rtlphy->pwrgroup_cnt][15]);
         }
         if (regaddr == RTXAGC_B_MCS03_MCS00) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][10] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][10] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][10] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][10]));
+                         [rtlphy->pwrgroup_cnt][10]);
         }
         if (regaddr == RTXAGC_B_MCS07_MCS04) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][11] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][11] = 0x%ulx\n",
+                         "MCSTxPowerLevelOriginalOffset[%d][11] = 0x%ulx\n",
                          rtlphy->pwrgroup_cnt,
                          rtlphy->mcs_txpwrlevel_origoffset
-                         [rtlphy->pwrgroup_cnt][11]));
+                         [rtlphy->pwrgroup_cnt][11]);
         }
         if (regaddr == RTXAGC_B_MCS11_MCS08) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][12] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][12] = 0x%ulx\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->mcs_txpwrlevel_origoffset
-                                        [rtlphy->pwrgroup_cnt][12]));
+                         "MCSTxPowerLevelOriginalOffset[%d][12] = 0x%ulx\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_txpwrlevel_origoffset
+                         [rtlphy->pwrgroup_cnt][12]);
         }
         if (regaddr == RTXAGC_B_MCS15_MCS12) {
                 rtlphy->mcs_txpwrlevel_origoffset[rtlphy->pwrgroup_cnt][13] =
                                                                          data;
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("MCSTxPowerLevelOriginalOffset[%d][13] = 0x%ulx\n",
-                          rtlphy->pwrgroup_cnt,
-                          rtlphy->mcs_txpwrlevel_origoffset
-                                        [rtlphy->pwrgroup_cnt][13]));
+                         "MCSTxPowerLevelOriginalOffset[%d][13] = 0x%ulx\n",
+                         rtlphy->pwrgroup_cnt,
+                         rtlphy->mcs_txpwrlevel_origoffset
+                         [rtlphy->pwrgroup_cnt][13]);
                 rtlphy->pwrgroup_cnt++;
         }
 }
@@ -849,7 +844,7 @@ static bool _rtl92d_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
                 }
         } else {
                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                         ("configtype != BaseBand_Config_PHY_REG\n"));
+                         "configtype != BaseBand_Config_PHY_REG\n");
         }
         return true;
 }
@@ -861,17 +856,17 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         bool rtstatus = true;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
         rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                 BASEBAND_CONFIG_PHY_REG);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Write BB Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
                 return false;
         }
 
         /* if (rtlphy->rf_type == RF_1T2R) {
          *      _rtl92c_phy_bb_config_1t(hw);
-         *     RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Config to 1T!!\n"));
+         *     RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Config to 1T!!\n");
          *} */
 
         if (rtlefuse->autoload_failflag == false) {
@@ -880,13 +875,13 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
                         BASEBAND_CONFIG_PHY_REG);
         }
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("BB_PG Reg Fail!!"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
                 return false;
         }
         rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                 BASEBAND_CONFIG_AGC_TAB);
         if (rtstatus != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("AGC Table Fail\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                 return false;
         }
         rtlphy->cck_high_power = (bool) (rtl_get_bbreg(hw,
@@ -951,19 +946,17 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 radiob_array_table = rtl8192de_radiob_2t_int_paarray;
         }
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PHY_ConfigRFWithHeaderFile() "
-                 "Radio_A:Rtl819XRadioA_1TArray\n"));
+                 "PHY_ConfigRFWithHeaderFile() Radio_A:Rtl819XRadioA_1TArray\n");
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("PHY_ConfigRFWithHeaderFile() "
-                 "Radio_B:Rtl819XRadioB_1TArray\n"));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath));
+                 "PHY_ConfigRFWithHeaderFile() Radio_B:Rtl819XRadioB_1TArray\n");
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
 
         /* this only happens when DMDP, mac0 start on 2.4G,
          * mac1 start on 5G, mac 0 has to set phy0&phy1
          * pathA or mac1 has to set phy0&phy1 pathA */
         if ((content == radiob_txt) && (rfpath == RF90_PATH_A)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         (" ===> althougth Path A, we load radiob.txt\n"));
+                         " ===> althougth Path A, we load radiob.txt\n");
                 radioa_arraylen = radiob_arraylen;
                 radioa_array_table = radiob_array_table;
         }
@@ -1022,11 +1015,11 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                 break;
         case RF90_PATH_C:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         case RF90_PATH_D:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         return true;
@@ -1046,19 +1039,18 @@ void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
         rtlphy->default_initialgain[3] =
             (u8) rtl_get_bbreg(hw, ROFDM0_XDAGCCORE1, BMASKBYTE0);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default initial gain (c50=0x%x, "
-                  "c58=0x%x, c60=0x%x, c68=0x%x\n",
-                  rtlphy->default_initialgain[0],
-                  rtlphy->default_initialgain[1],
-                  rtlphy->default_initialgain[2],
-                  rtlphy->default_initialgain[3]));
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x\n",
+                 rtlphy->default_initialgain[0],
+                 rtlphy->default_initialgain[1],
+                 rtlphy->default_initialgain[2],
+                 rtlphy->default_initialgain[3]);
         rtlphy->framesync = (u8)rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3,
                                               BMASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               BMASKDWORD);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                  ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 }
 
 static void _rtl92d_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
@@ -1172,7 +1164,7 @@ void rtl92d_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown Scan Backup operation.\n"));
+                                 "Unknown Scan Backup operation\n");
                         break;
                 }
         }
@@ -1193,14 +1185,13 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 return;
         if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("FALSE driver sleep or unload\n"));
+                         "FALSE driver sleep or unload\n");
                 return;
         }
         rtlphy->set_bwmode_inprogress = true;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
         reg_bw_opmode = rtl_read_byte(rtlpriv, REG_BWOPMODE);
         reg_prsr_rsc = rtl_read_byte(rtlpriv, REG_RRSR + 2);
         switch (rtlphy->current_chan_bw) {
@@ -1218,7 +1209,7 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
         switch (rtlphy->current_chan_bw) {
@@ -1250,13 +1241,13 @@ void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
 
         }
         rtl92d_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 static void _rtl92d_phy_stop_trx_before_changeband(struct ieee80211_hw *hw)
@@ -1273,7 +1264,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         u8 value8;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==>\n");
         rtlhal->bandset = band;
         rtlhal->current_bandtype = band;
         if (IS_92D_SINGLEPHY(rtlhal->version))
@@ -1283,13 +1274,13 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
         /* reconfig BB/RF according to wireless mode */
         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                 /* BB & RF Config */
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("====>2.4G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "====>2.4G\n");
                 if (rtlhal->interfaceindex == 1)
                         _rtl92d_phy_config_bb_with_headerfile(hw,
                                 BASEBAND_CONFIG_AGC_TAB);
         } else {
                 /* 5G band */
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "====>5G\n");
                 if (rtlhal->interfaceindex == 1)
                         _rtl92d_phy_config_bb_with_headerfile(hw,
                                 BASEBAND_CONFIG_AGC_TAB);
@@ -1317,7 +1308,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
                         0 ? REG_MAC0 : REG_MAC1), value8);
         }
         mdelay(1);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<==Switch Band OK.\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<==Switch Band OK\n");
 }
 
 static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
@@ -1329,9 +1320,9 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
         u8 group, i;
         unsigned long flag = 0;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>path %d\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>path %d\n", rfpath);
         if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>5G\n");
                 rtl_set_bbreg(hw, RFPGA0_RFMOD, BIT(25) | BIT(24), 0);
                 rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER4, 0x00f00000, 0xf);
                 /* fc area 0xd2c */
@@ -1353,14 +1344,13 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
         } else {
                 /* G band. */
                 RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                         ("Load RF IMR parameters for G band. IMR already "
-                         "setting %d\n",
-                          rtlpriv->rtlhal.load_imrandiqk_setting_for2g));
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>2.4G\n"));
+                         "Load RF IMR parameters for G band. IMR already setting %d\n",
+                         rtlpriv->rtlhal.load_imrandiqk_setting_for2g);
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>2.4G\n");
                 if (!rtlpriv->rtlhal.load_imrandiqk_setting_for2g) {
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                                ("Load RF IMR parameters "
-                                "for G band. %d\n", rfpath));
+                                 "Load RF IMR parameters for G band. %d\n",
+                                 rfpath);
                         rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
                         rtl_set_bbreg(hw, RFPGA0_RFMOD, BIT(25) | BIT(24), 0);
                         rtl_set_bbreg(hw, RFPGA0_ANALOGPARAMETER4,
@@ -1378,7 +1368,7 @@ static void _rtl92d_phy_reload_imr_setting(struct ieee80211_hw *hw,
                         rtl92d_release_cckandrw_pagea_ctl(hw, &flag);
                 }
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
@@ -1388,7 +1378,7 @@ static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "====>\n");
         /*----Store original RFENV control type----*/
         switch (rfpath) {
         case RF90_PATH_A:
@@ -1414,7 +1404,7 @@ static void _rtl92d_phy_enable_rf_env(struct ieee80211_hw *hw,
         /*Set 0 to 12 bits for 8255 */
         rtl_set_bbreg(hw, pphyreg->rfhssi_para2, B3WIREDATALENGTH, 0x0);
         udelay(1);
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
@@ -1424,7 +1414,7 @@ static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
         struct bb_reg_def *pphyreg = &rtlphy->phyreg_def[rfpath];
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("=====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "=====>\n");
         /*----Restore RFENV control type----*/ ;
         switch (rfpath) {
         case RF90_PATH_A:
@@ -1437,7 +1427,7 @@ static void _rtl92d_phy_restore_rf_env(struct ieee80211_hw *hw, u8 rfpath,
                               *pu4_regval);
                 break;
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<=====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<=====\n");
 }
 
 static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
@@ -1451,13 +1441,13 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
         bool need_pwr_down = false, internal_pa = false;
         u32 u4regvalue, mask = 0x1C000, value = 0, u4tmp, u4tmp2;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>\n");
         /* config path A for 5G */
         if (rtlhal->current_bandtype == BAND_ON_5G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>5G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>5G\n");
                 u4tmp = curveindex_5g[channel - 1];
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ver 1 set RF-A, 5G, "
-                        "0x28 = 0x%x !!\n", u4tmp));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "ver 1 set RF-A, 5G, 0x28 = 0x%x !!\n", u4tmp);
                 for (i = 0; i < RF_CHNL_NUM_5G; i++) {
                         if (channel == rf_chnl_5g[i] && channel <= 140)
                                 index = 0;
@@ -1503,12 +1493,13 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                               rf_reg_pram_c_5g[index][i]);
                         }
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                ("offset 0x%x value 0x%x "
-                                "path %d index %d readback 0x%x\n",
-                                rf_reg_for_c_cut_5g[i],
-                                rf_reg_pram_c_5g[index][i], path,
-                                index, rtl_get_rfreg(hw, (enum radio_path)path,
-                                rf_reg_for_c_cut_5g[i], BRFREGOFFSETMASK)));
+                                 "offset 0x%x value 0x%x path %d index %d readback 0x%x\n",
+                                 rf_reg_for_c_cut_5g[i],
+                                 rf_reg_pram_c_5g[index][i],
+                                 path, index,
+                                 rtl_get_rfreg(hw, (enum radio_path)path,
+                                               rf_reg_for_c_cut_5g[i],
+                                               BRFREGOFFSETMASK));
                 }
                 if (need_pwr_down)
                         _rtl92d_phy_restore_rf_env(hw, path, &u4regvalue);
@@ -1541,11 +1532,10 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                                 BRFREGOFFSETMASK,
                                                 rf_pram_c_5g_int_pa[index][i]);
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                                 ("offset 0x%x value 0x%x "
-                                                 "path %d index %d\n",
+                                                 "offset 0x%x value 0x%x path %d index %d\n",
                                                  rf_for_c_cut_5g_internal_pa[i],
                                                  rf_pram_c_5g_int_pa[index][i],
-                                                 rfpath, index));
+                                                 rfpath, index);
                                 }
                         } else {
                                 rtl_set_rfreg(hw, (enum radio_path)rfpath, 0x0B,
@@ -1553,10 +1543,10 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                         }
                 }
         } else if (rtlhal->current_bandtype == BAND_ON_2_4G) {
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("====>2.4G\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "====>2.4G\n");
                 u4tmp = curveindex_2g[channel - 1];
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ver 3 set RF-B, 2G, "
-                        "0x28 = 0x%x !!\n", u4tmp));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n", u4tmp);
                 if (channel == 1 || channel == 2 || channel == 4 || channel == 9
                     || channel == 10 || channel == 11 || channel == 12)
                         index = 0;
@@ -1590,18 +1580,17 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                                               rf_reg_param_for_c_cut_2g
                                               [index][i]);
                         RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                                ("offset 0x%x value 0x%x mak 0x%x path %d "
-                                "index %d readback 0x%x\n",
-                                rf_reg_for_c_cut_2g[i],
-                                rf_reg_param_for_c_cut_2g[index][i],
-                                rf_reg_mask_for_c_cut_2g[i], path, index,
-                                rtl_get_rfreg(hw, (enum radio_path)path,
-                                rf_reg_for_c_cut_2g[i],
-                                BRFREGOFFSETMASK)));
+                                 "offset 0x%x value 0x%x mak 0x%x path %d index %d readback 0x%x\n",
+                                 rf_reg_for_c_cut_2g[i],
+                                 rf_reg_param_for_c_cut_2g[index][i],
+                                 rf_reg_mask_for_c_cut_2g[i], path, index,
+                                 rtl_get_rfreg(hw, (enum radio_path)path,
+                                               rf_reg_for_c_cut_2g[i],
+                                               BRFREGOFFSETMASK));
                 }
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("cosa ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n",
-                        rf_syn_g4_for_c_cut_2g | (u4tmp << 11)));
+                        "cosa ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n",
+                        rf_syn_g4_for_c_cut_2g | (u4tmp << 11));
 
                 rtl_set_rfreg(hw, (enum radio_path)path, RF_SYN_G4,
                               BRFREGOFFSETMASK,
@@ -1611,7 +1600,7 @@ static void _rtl92d_phy_switch_rf_setting(struct ieee80211_hw *hw, u8 channel)
                 if (rtlhal->during_mac0init_radiob)
                         rtl92d_phy_powerdown_anotherphy(hw, true);
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 u8 rtl92d_get_rightchnlplace_for_iqk(u8 chnl)
@@ -1648,9 +1637,9 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
         u32 regeac, rege94, rege9c, regea4;
         u8 result = 0;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         if (rtlhal->interfaceindex == 0) {
                 rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x10008c1f);
                 rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x10008c1f);
@@ -1668,26 +1657,26 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
                 rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x28160206);
         }
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
         /* One shot, path A LOK & IQK */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "One shot, path A LOK & IQK!\n");
         rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf9000000);
         rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
         /* delay x ms */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Delay %d ms for One shot, path A LOK & IQK.\n",
-                IQK_DELAY_TIME));
+                "Delay %d ms for One shot, path A LOK & IQK\n",
+                IQK_DELAY_TIME);
         mdelay(IQK_DELAY_TIME);
         /* Check failed */
         regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
         rege94 = rtl_get_bbreg(hw, 0xe94, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe94 = 0x%x\n", rege94));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe94 = 0x%x\n", rege94);
         rege9c = rtl_get_bbreg(hw, 0xe9c, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe9c = 0x%x\n", rege9c));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe9c = 0x%x\n", rege9c);
         regea4 = rtl_get_bbreg(hw, 0xea4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xea4 = 0x%x\n", regea4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xea4 = 0x%x\n", regea4);
         if (!(regeac & BIT(28)) && (((rege94 & 0x03FF0000) >> 16) != 0x142) &&
             (((rege9c & 0x03FF0000) >> 16) != 0x42))
                 result |= 0x01;
@@ -1698,7 +1687,7 @@ static u8 _rtl92d_phy_patha_iqk(struct ieee80211_hw *hw, bool configpathb)
             (((regeac & 0x03FF0000) >> 16) != 0x36))
                 result |= 0x02;
         else
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A Rx IQK fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A Rx IQK fail!!\n");
         return result;
 }
 
@@ -1719,9 +1708,9 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 TxOKBit = BIT(31);
                 RxOKBit = BIT(30);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe38, BMASKDWORD, 0x82140307);
@@ -1734,7 +1723,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                 rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x68110000);
         }
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
         /* path-A PA on */
         rtl_set_bbreg(hw, RFPGA0_XAB_RFINTERFACESW, BMASKDWORD, 0x07000f60);
@@ -1742,29 +1731,29 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
         for (i = 0; i < retrycount; i++) {
                 /* One shot, path A LOK & IQK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("One shot, path A LOK & IQK!\n"));
+                        "One shot, path A LOK & IQK!\n");
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf9000000);
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
                 /* delay x ms */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Delay %d ms for One shot, path A LOK & IQK.\n",
-                        IQK_DELAY_TIME));
+                        "Delay %d ms for One shot, path A LOK & IQK.\n",
+                        IQK_DELAY_TIME);
                 mdelay(IQK_DELAY_TIME * 10);
                 /* Check failed */
                 regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
                 rege94 = rtl_get_bbreg(hw, 0xe94, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe94 = 0x%x\n", rege94));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe94 = 0x%x\n", rege94);
                 rege9c = rtl_get_bbreg(hw, 0xe9c, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xe9c = 0x%x\n", rege9c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xe9c = 0x%x\n", rege9c);
                 regea4 = rtl_get_bbreg(hw, 0xea4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xea4 = 0x%x\n", regea4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xea4 = 0x%x\n", regea4);
                 if (!(regeac & TxOKBit) &&
                      (((rege94 & 0x03FF0000) >> 16) != 0x142)) {
                         result |= 0x01;
                 } else { /* if Tx not OK, ignore Rx */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A Tx IQK fail!!\n"));
+                                "Path A Tx IQK fail!!\n");
                         continue;
                 }
 
@@ -1775,7 +1764,7 @@ static u8 _rtl92d_phy_patha_iqk_5g_normal(struct ieee80211_hw *hw,
                         break;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A Rx IQK fail!!\n"));
+                                "Path A Rx IQK fail!!\n");
                 }
         }
         /* path A PA off */
@@ -1793,27 +1782,26 @@ static u8 _rtl92d_phy_pathb_iqk(struct ieee80211_hw *hw)
         u32 regeac, regeb4, regebc, regec4, regecc;
         u8 result = 0;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B IQK!\n");
         /* One shot, path B LOK & IQK */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("One shot, path A LOK & IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "One shot, path A LOK & IQK!\n");
         rtl_set_bbreg(hw, 0xe60, BMASKDWORD, 0x00000002);
         rtl_set_bbreg(hw, 0xe60, BMASKDWORD, 0x00000000);
         /* delay x ms  */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Delay %d ms for One shot, path B LOK & IQK.\n",
-                IQK_DELAY_TIME));
+                "Delay %d ms for One shot, path B LOK & IQK\n", IQK_DELAY_TIME);
         mdelay(IQK_DELAY_TIME);
         /* Check failed */
         regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
         regeb4 = rtl_get_bbreg(hw, 0xeb4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeb4 = 0x%x\n", regeb4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeb4 = 0x%x\n", regeb4);
         regebc = rtl_get_bbreg(hw, 0xebc, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xebc = 0x%x\n", regebc));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xebc = 0x%x\n", regebc);
         regec4 = rtl_get_bbreg(hw, 0xec4, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xec4 = 0x%x\n", regec4));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xec4 = 0x%x\n", regec4);
         regecc = rtl_get_bbreg(hw, 0xecc, BMASKDWORD);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xecc = 0x%x\n", regecc));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xecc = 0x%x\n", regecc);
         if (!(regeac & BIT(31)) && (((regeb4 & 0x03FF0000) >> 16) != 0x142) &&
             (((regebc & 0x03FF0000) >> 16) != 0x42))
                 result |= 0x01;
@@ -1823,7 +1811,7 @@ static u8 _rtl92d_phy_pathb_iqk(struct ieee80211_hw *hw)
             (((regecc & 0x03FF0000) >> 16) != 0x36))
                 result |= 0x02;
         else
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B Rx IQK fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B Rx IQK fail!!\n");
         return result;
 }
 
@@ -1837,9 +1825,9 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         u8 i;
         u8 retrycount = 2;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQK!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path B IQK!\n");
         /* path-A IQK setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A IQK setting!\n");
         rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x18008c1f);
         rtl_set_bbreg(hw, 0xe38, BMASKDWORD, 0x82110000);
@@ -1852,7 +1840,7 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         rtl_set_bbreg(hw, 0xe5c, BMASKDWORD, 0x68160960);
 
         /* LO calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LO calibration setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LO calibration setting!\n");
         rtl_set_bbreg(hw, 0xe4c, BMASKDWORD, 0x00462911);
 
         /* path-B PA on */
@@ -1862,26 +1850,26 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
         for (i = 0; i < retrycount; i++) {
                 /* One shot, path B LOK & IQK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("One shot, path A LOK & IQK!\n"));
+                        "One shot, path A LOK & IQK!\n");
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xfa000000);
                 rtl_set_bbreg(hw, 0xe48, BMASKDWORD, 0xf8000000);
 
                 /* delay x ms */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Delay %d ms for One shot, path B LOK & IQK.\n", 10));
+                        "Delay %d ms for One shot, path B LOK & IQK.\n", 10);
                 mdelay(IQK_DELAY_TIME * 10);
 
                 /* Check failed */
                 regeac = rtl_get_bbreg(hw, 0xeac, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeac = 0x%x\n", regeac));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeac = 0x%x\n", regeac);
                 regeb4 = rtl_get_bbreg(hw, 0xeb4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xeb4 = 0x%x\n", regeb4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xeb4 = 0x%x\n", regeb4);
                 regebc = rtl_get_bbreg(hw, 0xebc, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xebc = 0x%x\n", regebc));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xebc = 0x%x\n", regebc);
                 regec4 = rtl_get_bbreg(hw, 0xec4, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xec4 = 0x%x\n", regec4));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xec4 = 0x%x\n", regec4);
                 regecc = rtl_get_bbreg(hw, 0xecc, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xecc = 0x%x\n", regecc));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "0xecc = 0x%x\n", regecc);
                 if (!(regeac & BIT(31)) &&
                     (((regeb4 & 0x03FF0000) >> 16) != 0x142))
                         result |= 0x01;
@@ -1893,7 +1881,7 @@ static u8 _rtl92d_phy_pathb_iqk_5g_normal(struct ieee80211_hw *hw)
                         break;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B Rx IQK fail!!\n"));
+                                "Path B Rx IQK fail!!\n");
                 }
         }
 
@@ -1912,7 +1900,7 @@ static void _rtl92d_phy_save_adda_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Save ADDA parameters.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Save ADDA parameters.\n");
         for (i = 0; i < regnum; i++)
                 adda_backup[i] = rtl_get_bbreg(hw, adda_reg[i], BMASKDWORD);
 }
@@ -1923,7 +1911,7 @@ static void _rtl92d_phy_save_mac_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Save MAC parameters.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Save MAC parameters.\n");
         for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 macbackup[i] = rtl_read_byte(rtlpriv, macreg[i]);
         macbackup[i] = rtl_read_dword(rtlpriv, macreg[i]);
@@ -1937,7 +1925,7 @@ static void _rtl92d_phy_reload_adda_registers(struct ieee80211_hw *hw,
         u32 i;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Reload ADDA power saving parameters !\n"));
+                "Reload ADDA power saving parameters !\n");
         for (i = 0; i < regnum; i++)
                 rtl_set_bbreg(hw, adda_reg[i], BMASKDWORD, adda_backup[i]);
 }
@@ -1948,7 +1936,7 @@ static void _rtl92d_phy_reload_mac_registers(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Reload MAC parameters !\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Reload MAC parameters !\n");
         for (i = 0; i < (IQK_MAC_REG_NUM - 1); i++)
                 rtl_write_byte(rtlpriv, macreg[i], (u8) macbackup[i]);
         rtl_write_byte(rtlpriv, macreg[i], macbackup[i]);
@@ -1961,7 +1949,7 @@ static void _rtl92d_phy_path_adda_on(struct ieee80211_hw *hw,
         u32 pathon;
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("ADDA ON.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "ADDA ON.\n");
         pathon = patha_on ? 0x04db25a4 : 0x0b1b25a4;
         if (patha_on)
                 pathon = rtlpriv->rtlhal.interfaceindex == 0 ?
@@ -1976,7 +1964,7 @@ static void _rtl92d_phy_mac_setting_calibration(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 i;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("MAC settings for Calibration.\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "MAC settings for Calibration.\n");
         rtl_write_byte(rtlpriv, macreg[0], 0x3F);
 
         for (i = 1; i < (IQK_MAC_REG_NUM - 1); i++)
@@ -1988,7 +1976,7 @@ static void _rtl92d_phy_mac_setting_calibration(struct ieee80211_hw *hw,
 static void _rtl92d_phy_patha_standby(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path-A standby mode!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path-A standby mode!\n");
 
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x0);
         rtl_set_bbreg(hw, RFPGA0_XA_LSSIPARAMETER, BMASKDWORD, 0x00010000);
@@ -2001,7 +1989,7 @@ static void _rtl92d_phy_pimode_switch(struct ieee80211_hw *hw, bool pi_mode)
         u32 mode;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("BB Switch to %s mode!\n", (pi_mode ? "PI" : "SI")));
+                "BB Switch to %s mode!\n", pi_mode ? "PI" : "SI");
         mode = pi_mode ? 0x01000100 : 0x01000000;
         rtl_set_bbreg(hw, 0x820, BMASKDWORD, mode);
         rtl_set_bbreg(hw, 0x828, BMASKDWORD, mode);
@@ -2033,12 +2021,12 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
         const u32 retrycount = 2;
         u32 bbvalue;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK for 2.4G :Start!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK for 2.4G :Start!!!\n");
         if (t == 0) {
                 bbvalue = rtl_get_bbreg(hw, RFPGA0_RFMOD, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("==>0x%08x\n", bbvalue));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQ Calibration for %s\n",
-                        (is2t ? "2T2R" : "1T1R")));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "==>0x%08x\n", bbvalue);
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "IQ Calibration for %s\n",
+                        is2t ? "2T2R" : "1T1R");
 
                 /*  Save ADDA parameters, turn Path A ADDA on */
                 _rtl92d_phy_save_adda_registers(hw, adda_reg,
@@ -2076,7 +2064,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
         if (is2t)
                 rtl_set_bbreg(hw, 0xb6c, BMASKDWORD, 0x0f600000);
         /* IQ calibration setting */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK setting!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x80800000);
         rtl_set_bbreg(hw, 0xe40, BMASKDWORD, 0x01007c00);
         rtl_set_bbreg(hw, 0xe44, BMASKDWORD, 0x01004800);
@@ -2084,7 +2072,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 patha_ok = _rtl92d_phy_patha_iqk(hw, is2t);
                 if (patha_ok == 0x03) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A IQK Success!!\n"));
+                                "Path A IQK Success!!\n");
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                         0x3FF0000) >> 16;
                         result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
@@ -2097,7 +2085,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 } else if (i == (retrycount - 1) && patha_ok == 0x01) {
                         /* Tx IQK OK */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path A IQK Only  Tx Success!!\n"));
+                                "Path A IQK Only  Tx Success!!\n");
 
                         result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                         0x3FF0000) >> 16;
@@ -2106,7 +2094,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 }
         }
         if (0x00 == patha_ok)
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK failed!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK failed!!\n");
         if (is2t) {
                 _rtl92d_phy_patha_standby(hw);
                 /* Turn Path B ADDA on */
@@ -2115,7 +2103,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                         pathb_ok = _rtl92d_phy_pathb_iqk(hw);
                         if (pathb_ok == 0x03) {
                                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("Path B IQK Success!!\n"));
+                                        "Path B IQK Success!!\n");
                                 result[t][4] = (rtl_get_bbreg(hw, 0xeb4,
                                                BMASKDWORD) & 0x3FF0000) >> 16;
                                 result[t][5] = (rtl_get_bbreg(hw, 0xebc,
@@ -2128,7 +2116,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                         } else if (i == (retrycount - 1) && pathb_ok == 0x01) {
                                 /* Tx IQK OK */
                                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                        ("Path B Only Tx IQK Success!!\n"));
+                                        "Path B Only Tx IQK Success!!\n");
                                 result[t][4] = (rtl_get_bbreg(hw, 0xeb4,
                                                BMASKDWORD) & 0x3FF0000) >> 16;
                                 result[t][5] = (rtl_get_bbreg(hw, 0xebc,
@@ -2137,12 +2125,12 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 }
                 if (0x00 == pathb_ok)
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK failed!!\n"));
+                                "Path B IQK failed!!\n");
         }
 
         /* Back to BB mode, load original value */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Back to BB mode, load original value!\n"));
+                "IQK:Back to BB mode, load original value!\n");
 
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0);
         if (t != 0) {
@@ -2167,7 +2155,7 @@ static void _rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw, long result[][8],
                 rtl_set_bbreg(hw, 0xe30, BMASKDWORD, 0x01008c00);
                 rtl_set_bbreg(hw, 0xe34, BMASKDWORD, 0x01008c00);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("<==\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "<==\n");
 }
 
 static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
@@ -2199,13 +2187,13 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
         /* Note: IQ calibration must be performed after loading
          * PHY_REG.txt , and radio_a, radio_b.txt */
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK for 5G NORMAL:Start!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK for 5G NORMAL:Start!!!\n");
         mdelay(IQK_DELAY_TIME * 20);
         if (t == 0) {
                 bbvalue = rtl_get_bbreg(hw, RFPGA0_RFMOD, BMASKDWORD);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("==>0x%08x\n", bbvalue));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQ Calibration for %s\n",
-                        (is2t ? "2T2R" : "1T1R")));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "==>0x%08x\n", bbvalue);
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "IQ Calibration for %s\n",
+                        is2t ? "2T2R" : "1T1R");
                 /* Save ADDA parameters, turn Path A ADDA on */
                 _rtl92d_phy_save_adda_registers(hw, adda_reg,
                                                 rtlphy->adda_backup,
@@ -2242,13 +2230,13 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
         if (is2t)
                 rtl_set_bbreg(hw, 0xb6c, BMASKDWORD, 0x0f600000);
         /* IQ calibration setting  */
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("IQK setting!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "IQK setting!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0x80800000);
         rtl_set_bbreg(hw, 0xe40, BMASKDWORD, 0x10007c00);
         rtl_set_bbreg(hw, 0xe44, BMASKDWORD, 0x01004800);
         patha_ok = _rtl92d_phy_patha_iqk_5g_normal(hw, is2t);
         if (patha_ok == 0x03) {
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK Success!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK Success!!\n");
                 result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                 0x3FF0000) >> 16;
                 result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
@@ -2259,14 +2247,14 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                                 0x3FF0000) >> 16;
         } else if (patha_ok == 0x01) {  /* Tx IQK OK */
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("Path A IQK Only  Tx Success!!\n"));
+                        "Path A IQK Only  Tx Success!!\n");
 
                 result[t][0] = (rtl_get_bbreg(hw, 0xe94, BMASKDWORD) &
                                 0x3FF0000) >> 16;
                 result[t][1] = (rtl_get_bbreg(hw, 0xe9c, BMASKDWORD) &
                                 0x3FF0000) >> 16;
         } else {
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path A IQK Fail!!\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "Path A IQK Fail!!\n");
         }
         if (is2t) {
                 /* _rtl92d_phy_patha_standby(hw); */
@@ -2275,7 +2263,7 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                 pathb_ok = _rtl92d_phy_pathb_iqk_5g_normal(hw);
                 if (pathb_ok == 0x03) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK Success!!\n"));
+                                "Path B IQK Success!!\n");
                         result[t][4] = (rtl_get_bbreg(hw, 0xeb4, BMASKDWORD) &
                              0x3FF0000) >> 16;
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, BMASKDWORD) &
@@ -2286,20 +2274,20 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                              0x3FF0000) >> 16;
                 } else if (pathb_ok == 0x01) { /* Tx IQK OK */
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B Only Tx IQK Success!!\n"));
+                                "Path B Only Tx IQK Success!!\n");
                         result[t][4] = (rtl_get_bbreg(hw, 0xeb4, BMASKDWORD) &
                              0x3FF0000) >> 16;
                         result[t][5] = (rtl_get_bbreg(hw, 0xebc, BMASKDWORD) &
                              0x3FF0000) >> 16;
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("Path B IQK failed!!\n"));
+                                "Path B IQK failed!!\n");
                 }
         }
 
         /* Back to BB mode, load original value */
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Back to BB mode, load original value!\n"));
+                "IQK:Back to BB mode, load original value!\n");
         rtl_set_bbreg(hw, 0xe28, BMASKDWORD, 0);
         if (t != 0) {
                 if (is2t)
@@ -2321,7 +2309,7 @@ static void _rtl92d_phy_iq_calibrate_5g_normal(struct ieee80211_hw *hw,
                                                   rtlphy->adda_backup,
                                                   IQK_ADDA_REG_NUM);
         }
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("<==\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "<==\n");
 }
 
 static bool _rtl92d_phy_simularity_compare(struct ieee80211_hw *hw,
@@ -2395,8 +2383,7 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
             rtlhal->macphymode == DUALMAC_DUALPHY;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("Path A IQ Calibration %s !\n",
-                (iqk_ok) ? "Success" : "Failed"));
+                "Path A IQ Calibration %s !\n", iqk_ok ? "Success" : "Failed");
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
@@ -2406,8 +2393,9 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if ((val_x & 0x00000200) != 0)
                         val_x = val_x | 0xFFFFFC00;
                 tx0_a = (val_x * oldval_0) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("X = 0x%x, tx0_a = 0x%x,"
-                        " oldval_0 0x%x\n",     val_x, tx0_a, oldval_0));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "X = 0x%x, tx0_a = 0x%x, oldval_0 0x%x\n",
+                        val_x, tx0_a, oldval_0);
                 rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x3FF, tx0_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(24),
                               ((val_x * oldval_0 >> 7) & 0x1));
@@ -2419,8 +2407,9 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                         rtlhal->current_bandtype == BAND_ON_5G)
                         val_y += 3;
                 tx0_c = (val_y * oldval_0) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Y = 0x%lx, tx0_c = 0x%lx\n",
-                        val_y, tx0_c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,
+                        "Y = 0x%lx, tx0_c = 0x%lx\n",
+                        val_y, tx0_c);
                 rtl_set_bbreg(hw, ROFDM0_XCTxAFE, 0xF0000000,
                               ((tx0_c & 0x3C0) >> 6));
                 rtl_set_bbreg(hw, ROFDM0_XATxIQIMBALANCE, 0x003F0000,
@@ -2428,11 +2417,11 @@ static void _rtl92d_phy_patha_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if (is2t)
                         rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(26),
                                       ((val_y * oldval_0 >> 7) & 0x1));
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("0xC80 = 0x%x\n",
-                         rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
-                                       BMASKDWORD)));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "0xC80 = 0x%x\n",
+                        rtl_get_bbreg(hw, ROFDM0_XATxIQIMBALANCE,
+                                      BMASKDWORD));
                 if (txonly) {
-                        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("only Tx OK\n"));
+                        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "only Tx OK\n");
                         return;
                 }
                 reg = result[final_candidate][2];
@@ -2452,8 +2441,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
         u32 oldval_1, val_x, tx1_a, reg;
         long val_y, tx1_c;
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Path B IQ Calibration %s !\n",
-                 (iqk_ok) ? "Success" : "Failed"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK, "Path B IQ Calibration %s !\n",
+                iqk_ok ? "Success" : "Failed");
         if (final_candidate == 0xFF) {
                 return;
         } else if (iqk_ok) {
@@ -2463,8 +2452,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if ((val_x & 0x00000200) != 0)
                         val_x = val_x | 0xFFFFFC00;
                 tx1_a = (val_x * oldval_1) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("X = 0x%x, tx1_a = 0x%x\n",
-                        val_x, tx1_a));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "X = 0x%x, tx1_a = 0x%x\n",
+                        val_x, tx1_a);
                 rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x3FF, tx1_a);
                 rtl_set_bbreg(hw, ROFDM0_ECCATHRESHOLD, BIT(28),
                               ((val_x * oldval_1 >> 7) & 0x1));
@@ -2474,8 +2463,8 @@ static void _rtl92d_phy_pathb_fill_iqk_matrix(struct ieee80211_hw *hw,
                 if (rtlhal->current_bandtype == BAND_ON_5G)
                         val_y += 3;
                 tx1_c = (val_y * oldval_1) >> 8;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("Y = 0x%lx, tx1_c = 0x%lx\n",
-                        val_y, tx1_c));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "Y = 0x%lx, tx1_c = 0x%lx\n",
+                        val_y, tx1_c);
                 rtl_set_bbreg(hw, ROFDM0_XDTxAFE, 0xF0000000,
                               ((tx1_c & 0x3C0) >> 6));
                 rtl_set_bbreg(hw, ROFDM0_XBTxIQIMBALANCE, 0x003F0000,
@@ -2507,7 +2496,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
         unsigned long flag = 0;
 
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK:Start!!!channel %d\n", rtlphy->current_channel));
+                "IQK:Start!!!channel %d\n", rtlphy->current_channel);
         for (i = 0; i < 8; i++) {
                 result[0][i] = 0;
                 result[1][i] = 0;
@@ -2521,7 +2510,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
         is23simular = false;
         is13simular = false;
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("IQK !!!currentband %d\n", rtlhal->current_bandtype));
+                "IQK !!!currentband %d\n", rtlhal->current_bandtype);
         rtl92d_acquire_cckandrw_pagea_ctl(hw, &flag);
         for (i = 0; i < 3; i++) {
                 if (rtlhal->current_bandtype == BAND_ON_5G) {
@@ -2573,10 +2562,9 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                 regec4 = result[i][6];
                 regecc = result[i][7];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx "
-                        "regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n ",
+                        "IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n",
                         rege94, rege9c, regea4, regeac, regeb4, regebc, regec4,
-                        regecc));
+                        regecc);
         }
         if (final_candidate != 0xff) {
                 rtlphy->reg_e94 = rege94 = result[final_candidate][0];
@@ -2588,12 +2576,11 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                 regec4 = result[final_candidate][6];
                 regecc = result[final_candidate][7];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: final_candidate is %x\n", final_candidate));
+                        "IQK: final_candidate is %x\n", final_candidate);
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx "
-                        "regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n ",
+                        "IQK: rege94=%lx rege9c=%lx regea4=%lx regeac=%lx regeb4=%lx regebc=%lx regec4=%lx regecc=%lx\n",
                         rege94, rege9c, regea4, regeac, regeb4, regebc, regec4,
-                        regecc));
+                        regecc);
                 patha_ok = pathb_ok = true;
         } else {
                 rtlphy->reg_e94 = rtlphy->reg_eb4 = 0x100; /* X default value */
@@ -2618,7 +2605,7 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                         true;
 
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_MLME, DBG_LOUD,
-                         ("\nIQK OK indexforchannel %d.\n", indexforchannel));
+                         "IQK OK indexforchannel %d\n", indexforchannel);
         }
 }
 
@@ -2629,17 +2616,17 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
         struct rtl_hal *rtlhal = &(rtlpriv->rtlhal);
         u8 indexforchannel;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("channel %d\n", channel));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "channel %d\n", channel);
         /*------Do IQK for normal chip and test chip 5G band------- */
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                ("indexforchannel %d done %d\n", indexforchannel,
-                rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "indexforchannel %d done %d\n",
+                 indexforchannel,
+                 rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done);
         if (0 && !rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done &&
                 rtlphy->need_iqk) {
                 /* Re Do IQK. */
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_LOUD,
-                         ("Do IQK Matrix reg for channel:%d....\n", channel));
+                         "Do IQK Matrix reg for channel:%d....\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
         } else {
                 /* Just load the value. */
@@ -2647,8 +2634,8 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                 if (((!rtlhal->load_imrandiqk_setting_for2g) &&
                     indexforchannel == 0) || indexforchannel > 0) {
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
-                                 ("Just Read IQK Matrix reg for channel:%d"
-                                 "....\n", channel));
+                                 "Just Read IQK Matrix reg for channel:%d....\n",
+                                 channel);
                         if ((rtlphy->iqk_matrix_regsetting[indexforchannel].
                              value[0] != NULL)
                                 /*&&(regea4 != 0) */)
@@ -2672,7 +2659,7 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                 }
         }
         rtlphy->need_iqk = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static u32 _rtl92d_phy_get_abs(u32 val1, u32 val2)
@@ -2727,8 +2714,8 @@ static void _rtl92d_phy_calc_curvindex(struct ieee80211_hw *hw,
                         }
                 }
                 smallest_abs_val = 0xffffffff;
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("curveindex[%d] = %x\n", i,
-                        curveindex[i]));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK, "curveindex[%d] = %x\n",
+                        i, curveindex[i]);
         }
 }
 
@@ -2743,14 +2730,14 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
         u32 u4tmp = 0, u4regvalue = 0;
         bool bneed_powerdown_radio = false;
 
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("path %d\n", erfpath));
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("band type = %d\n",
-                rtlpriv->rtlhal.current_bandtype));
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("channel = %d\n", channel));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "path %d\n", erfpath);
+        RTPRINT(rtlpriv, FINIT, INIT_IQK, "band type = %d\n",
+                rtlpriv->rtlhal.current_bandtype);
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "channel = %d\n", channel);
         if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */
                 u4tmp = curveindex_5g[channel-1];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 1 set RF-A, 5G,   0x28 = 0x%ulx !!\n", u4tmp));
+                        "ver 1 set RF-A, 5G,    0x28 = 0x%ulx !!\n", u4tmp);
                 if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
                         rtlpriv->rtlhal.interfaceindex == 1) {
                         bneed_powerdown_radio =
@@ -2769,7 +2756,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
         } else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) {
                 u4tmp = curveindex_2g[channel-1];
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp));
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp);
                 if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
                         rtlpriv->rtlhal.interfaceindex == 0) {
                         bneed_powerdown_radio =
@@ -2781,14 +2768,14 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
                 }
                 rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp);
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
-                        rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800)));
+                        "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
+                        rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800));
                 if (bneed_powerdown_radio)
                         _rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue);
                 if (rtlpriv->rtlhal.during_mac0init_radiob)
                         rtl92d_phy_powerdown_anotherphy(hw, true);
         }
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "<====\n");
 }
 
 static void _rtl92d_phy_lc_calibrate_sw(struct ieee80211_hw *hw, bool is2t)
@@ -2836,20 +2823,20 @@ static void _rtl92d_phy_lc_calibrate_sw(struct ieee80211_hw *hw, bool is2t)
                                               RF_SYN_G6, BRFREGOFFSETMASK);
                 }
                 RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                        ("PHY_LCK finish delay for %d ms=2\n", timecount));
+                        "PHY_LCK finish delay for %d ms=2\n", timecount);
                 u4tmp = rtl_get_rfreg(hw, index, RF_SYN_G4, BRFREGOFFSETMASK);
                 if (index == 0 && rtlhal->interfaceindex == 0) {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("path-A / 5G LCK\n"));
+                                "path-A / 5G LCK\n");
                 } else {
                         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                                ("path-B / 2.4G LCK\n"));
+                                "path-B / 2.4G LCK\n");
                 }
                 memset(&curvecount_val[0], 0, CV_CURVE_CNT * 2);
                 /* Set LC calibration off */
                 rtl_set_rfreg(hw, (enum radio_path)index, RF_CHNLBW,
                               0x08000, 0x0);
-                RTPRINT(rtlpriv, FINIT, INIT_IQK, ("set RF 0x18[15] = 0\n"));
+                RTPRINT(rtlpriv, FINIT, INIT_IQK,  "set RF 0x18[15] = 0\n");
                 /* save Curve-counting number */
                 for (i = 0; i < CV_CURVE_CNT; i++) {
                         u32 readval = 0, readval2 = 0;
@@ -2899,7 +2886,7 @@ static void _rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("cosa PHY_LCK ver=2\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "cosa PHY_LCK ver=2\n");
         _rtl92d_phy_lc_calibrate_sw(hw, is2t);
 }
 
@@ -2917,8 +2904,8 @@ void rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw)
 
         rtlphy->lck_inprogress = true;
         RTPRINT(rtlpriv, FINIT, INIT_IQK,
-                ("LCK:Start!!! currentband %x delay %d ms\n",
-                 rtlhal->current_bandtype, timecount));
+                "LCK:Start!!! currentband %x delay %d ms\n",
+                rtlhal->current_bandtype, timecount);
         if (IS_92D_SINGLEPHY(rtlhal->version)) {
                 _rtl92d_phy_lc_calibrate(hw, true);
         } else {
@@ -2926,7 +2913,7 @@ void rtl92d_phy_lc_calibrate(struct ieee80211_hw *hw)
                 _rtl92d_phy_lc_calibrate(hw, false);
         }
         rtlphy->lck_inprogress = false;
-        RTPRINT(rtlpriv, FINIT, INIT_IQK, ("LCK:Finish!!!\n"));
+        RTPRINT(rtlpriv, FINIT, INIT_IQK,  "LCK:Finish!!!\n");
 }
 
 void rtl92d_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)
@@ -2941,7 +2928,7 @@ static bool _rtl92d_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
         if (cmdtableidx >= cmdtablesz)
@@ -2962,10 +2949,10 @@ void rtl92d_phy_reset_iqk_result(struct ieee80211_hw *hw)
         u8 i;
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("settings regs %d default regs %d\n",
-                        (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
-                        sizeof(struct iqk_matrix_regs)),
-                        IQK_MATRIX_REG_NUM));
+                 "settings regs %d default regs %d\n",
+                 (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
+                       sizeof(struct iqk_matrix_regs)),
+                 IQK_MATRIX_REG_NUM);
         /* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */
         for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
                 rtlphy->iqk_matrix_regsetting[i].value[0][0] = 0x100;
@@ -3084,7 +3071,7 @@ static bool _rtl92d_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
                 break;
@@ -3111,7 +3098,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
 
         if ((is_hal_stop(rtlhal)) || (RT_CANNOT_IO(hw))) {
                 RT_TRACE(rtlpriv, COMP_CHAN, DBG_LOUD,
-                         ("sw_chnl_inprogress false driver sleep or unload\n"));
+                         "sw_chnl_inprogress false driver sleep or unload\n");
                 return 0;
         }
         while (rtlphy->lck_inprogress && timecount < timeout) {
@@ -3133,19 +3120,18 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
                  * 5G and 2.4G band. */
                 if (channel <= 14)
                         return 0;
-                RT_ASSERT((channel > 14), ("5G but channel<=14"));
+                RT_ASSERT((channel > 14), "5G but channel<=14\n");
                 break;
         case BAND_ON_2_4G:
                 /* Get first channel error when change between
                  * 5G and 2.4G band. */
                 if (channel > 14)
                         return 0;
-                RT_ASSERT((channel <= 14), ("2G but channel>14"));
+                RT_ASSERT((channel <= 14), "2G but channel>14\n");
                 break;
         default:
-                RT_ASSERT(false,
-                          ("Invalid WirelessMode(%#x)!!\n",
-                           rtlpriv->mac80211.mode));
+                RT_ASSERT(false, "Invalid WirelessMode(%#x)!!\n",
+                          rtlpriv->mac80211.mode);
                 break;
         }
         rtlphy->sw_chnl_inprogress = true;
@@ -3154,7 +3140,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
         rtlphy->sw_chnl_stage = 0;
         rtlphy->sw_chnl_step = 0;
         RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n", rtlphy->current_channel));
+                 "switch to channel%d\n", rtlphy->current_channel);
 
         do {
                 if (!rtlphy->sw_chnl_inprogress)
@@ -3171,7 +3157,7 @@ u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw)
                 }
                 break;
         } while (true);
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
         rtlphy->sw_chnl_inprogress = false;
         return 1;
 }
@@ -3182,8 +3168,8 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
         struct rtl_phy *rtlphy = &(rtlpriv->phy);
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("--->Cmd(%#x), set_io_inprogress(%d)\n",
-                 rtlphy->current_io_type, rtlphy->set_io_inprogress));
+                 "--->Cmd(%#x), set_io_inprogress(%d)\n",
+                 rtlphy->current_io_type, rtlphy->set_io_inprogress);
         switch (rtlphy->current_io_type) {
         case IO_CMD_RESUME_DM_BY_SCAN:
                 de_digtable.cur_igvalue = rtlphy->initgain_backup.xaagccore1;
@@ -3197,12 +3183,12 @@ static void rtl92d_phy_set_io(struct ieee80211_hw *hw)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         rtlphy->set_io_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("<---(%#x)\n", rtlphy->current_io_type));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<---(%#x)\n",
+                 rtlphy->current_io_type);
 }
 
 bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
@@ -3212,23 +3198,23 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
         bool postprocessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                 ("-->IO Cmd(%#x), set_io_inprogress(%d)\n",
-                 iotype, rtlphy->set_io_inprogress));
+                 "-->IO Cmd(%#x), set_io_inprogress(%d)\n",
+                 iotype, rtlphy->set_io_inprogress);
         do {
                 switch (iotype) {
                 case IO_CMD_RESUME_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Resume DM after scan.\n"));
+                                 "[IO CMD] Resume DM after scan\n");
                         postprocessing = true;
                         break;
                 case IO_CMD_PAUSE_DM_BY_SCAN:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE,
-                                 ("[IO CMD] Pause DM before scan.\n"));
+                                 "[IO CMD] Pause DM before scan\n");
                         postprocessing = true;
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
         } while (false);
@@ -3239,7 +3225,7 @@ bool rtl92d_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype)
                 return false;
         }
         rtl92d_phy_set_io(hw);
-        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, ("<--IO Type(%#x)\n", iotype));
+        RT_TRACE(rtlpriv, COMP_CMD, DBG_TRACE, "<--IO Type(%#x)\n", iotype);
         return true;
 }
 
@@ -3297,7 +3283,7 @@ static void _rtl92d_phy_set_rfsleep(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);
                 rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Fail !!! Switch RF timeout.\n"));
+                         "Fail !!! Switch RF timeout\n");
                 return;
         }
         /* e.   For PCIE: SYS_FUNC_EN 0x02[7:0] = 0xE2 reset BB TRX function */
@@ -3332,7 +3318,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                         do {
                                 InitializeCount++;
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic enable\n"));
+                                         "IPS Set eRf nic enable\n");
                                 rtstatus = rtl_ps_enable_nic(hw);
                         } while ((rtstatus != true) &&
                                  (InitializeCount < 10));
@@ -3341,11 +3327,10 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                           RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("awake, sleeped:%d ms state_"
-                                 "inap:%x\n",
+                                 "awake, sleeped:%d ms state_inap:%x\n",
                                  jiffies_to_msecs(jiffies -
-                                 ppsc->last_sleep_jiffies),
-                                 rtlpriv->psc.state_inap));
+                                                  ppsc->last_sleep_jiffies),
+                                 rtlpriv->psc.state_inap);
                         ppsc->last_awake_jiffies = jiffies;
                         _rtl92d_phy_set_rfon(hw);
                 }
@@ -3360,7 +3345,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:
                 if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                 ("IPS Set eRf nic disable\n"));
+                                 "IPS Set eRf nic disable\n");
                         rtl_ps_disable_nic(hw);
                         RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                 } else {
@@ -3385,41 +3370,40 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 continue;
                         } else if (rtlpci->pdev->current_state != PCI_D0) {
                                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                         ("eRf Off/Sleep: %d times TcbBusyQueu"
-                                         "e[%d] !=0 but lower power state!\n",
-                                         (i + 1), queue_id));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 but lower power state!\n",
+                                         i + 1, queue_id);
                                 break;
                         } else {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("eRf Off/Sleep: %d times TcbBusyQueu"
-                                         "e[%d] =%d "
-                                         "before doze!\n", (i + 1), queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n",
+                                         i + 1, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 udelay(10);
                                 i++;
                         }
 
                         if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                         ("\nERFOFF: %d times TcbBusyQueue[%d] "
-                                         "= %d !\n",
-                                          MAX_DOZE_WAITING_TIMES_9x, queue_id,
-                                          skb_queue_len(&ring->queue)));
+                                         "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
+                                         MAX_DOZE_WAITING_TIMES_9x, queue_id,
+                                         skb_queue_len(&ring->queue));
                                 break;
                         }
                 }
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                         ("Set rfsleep awaked:%d ms\n",
-                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies)));
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, ("sleep awaked:%d ms "
-                         "state_inap:%x\n", jiffies_to_msecs(jiffies -
-                         ppsc->last_awake_jiffies), rtlpriv->psc.state_inap));
+                         "Set rfsleep awaked:%d ms\n",
+                         jiffies_to_msecs(jiffies - ppsc->last_awake_jiffies));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
+                         "sleep awaked:%d ms state_inap:%x\n",
+                         jiffies_to_msecs(jiffies -
+                                          ppsc->last_awake_jiffies),
+                         rtlpriv->psc.state_inap);
                 ppsc->last_sleep_jiffies = jiffies;
                 _rtl92d_phy_set_rfsleep(hw);
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
@@ -3437,17 +3421,17 @@ void rtl92d_phy_config_macphymode(struct ieee80211_hw *hw)
         switch (rtlhal->macphymode) {
         case DUALMAC_DUALPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: DUALMAC_DUALPHY\n"));
+                         "MacPhyMode: DUALMAC_DUALPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF3);
                 break;
         case SINGLEMAC_SINGLEPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: SINGLEMAC_SINGLEPHY\n"));
+                         "MacPhyMode: SINGLEMAC_SINGLEPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF4);
                 break;
         case DUALMAC_SINGLEPHY:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("MacPhyMode: DUALMAC_SINGLEPHY\n"));
+                         "MacPhyMode: DUALMAC_SINGLEPHY\n");
                 rtl_write_byte(rtlpriv, offset, 0xF1);
                 break;
         }
@@ -3578,7 +3562,7 @@ void rtl92d_phy_set_poweron(struct ieee80211_hw *hw)
                         }
                 }
                 if (i == 200)
-                        RT_ASSERT(false, ("Another mac power off over time\n"));
+                        RT_ASSERT(false, "Another mac power off over time\n");
         }
 }
 
@@ -3615,7 +3599,7 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
         u8 rfpath, i;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==>\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "==>\n");
         /* r_select_5G for path_A/B 0 for 2.4G, 1 for 5G */
         if (rtlhal->current_bandtype == BAND_ON_2_4G) {
                 /* r_select_5G for path_A/B,0x878 */
@@ -3764,7 +3748,7 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                 } else {
                         rtl92d_phy_enable_anotherphy(hw, false);
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                 ("MAC1 use DBI to update 0x888"));
+                                 "MAC1 use DBI to update 0x888\n");
                         /* 0x888 */
                         rtl92de_write_dword_dbi(hw, RFPGA0_ADDALLOCKEN,
                                                 rtl92de_read_dword_dbi(hw,
@@ -3789,9 +3773,9 @@ void rtl92d_update_bbrf_configuration(struct ieee80211_hw *hw)
                         BRFREGOFFSETMASK);
         }
         for (i = 0; i < 2; i++)
-                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("RF 0x18 = 0x%x\n",
-                          rtlphy->rfreg_chnlval[i]));
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<==\n"));
+                RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "RF 0x18 = 0x%x\n",
+                         rtlphy->rfreg_chnlval[i]);
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "<==\n");
 
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
index a52c824b41e3..f074952bf25c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
index 131acc306fcc..9bc462331078 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c b/drivers/net/wireless/rtlwifi/rtl8192de/rf.c
index db27cebaac2c..ff34d2dd39b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/rf.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
@@ -50,8 +50,8 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                                       BIT(11), 0x01);
 
                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                 ("20M RF 0x18 = 0x%x\n",
-                                 rtlphy->rfreg_chnlval[rfpath]));
+                                 "20M RF 0x18 = 0x%x\n",
+                                 rtlphy->rfreg_chnlval[rfpath]);
                 }
 
                 break;
@@ -62,13 +62,13 @@ void rtl92d_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                         rtl_set_rfreg(hw, rfpath, RF_CHNLBW, BIT(10) | BIT(11),
                                       0x00);
                         RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD,
-                                 ("40M RF 0x18 = 0x%x\n",
-                                 rtlphy->rfreg_chnlval[rfpath]));
+                                 "40M RF 0x18 = 0x%x\n",
+                                 rtlphy->rfreg_chnlval[rfpath]);
                 }
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
@@ -127,23 +127,23 @@ void rtl92d_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
         tmpval = tx_agc[RF90_PATH_A] & 0xff;
         rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, BMASKBYTE1, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_A_CCK1_MCS32));
+                "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_A_CCK1_MCS32);
         tmpval = tx_agc[RF90_PATH_A] >> 8;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] >> 24;
         rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, BMASKBYTE0, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK11_A_CCK2_11));
+                "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK11_A_CCK2_11);
         tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
         rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                ("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval,
-                RTXAGC_B_CCK1_55_MCS32));
+                "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
+                tmpval, RTXAGC_B_CCK1_55_MCS32);
 }
 
 static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
@@ -165,8 +165,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
                     (powerbase0 << 8) | powerbase0;
                 *(ofdmbase + i) = powerbase0;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [OFDM power base index rf(%c) = 0x%x]\n",
-                        ((i == 0) ? 'A' : 'B'), *(ofdmbase + i)));
+                        " [OFDM power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(ofdmbase + i));
         }
 
         for (i = 0; i < 2; i++) {
@@ -179,8 +179,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
                              (powerbase1 << 8) | powerbase1;
                 *(mcsbase + i) = powerbase1;
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        (" [MCS power base index rf(%c) = 0x%x]\n",
-                        ((i == 0) ? 'A' : 'B'), *(mcsbase + i)));
+                        " [MCS power base index rf(%c) = 0x%x]\n",
+                        i == 0 ? 'A' : 'B', *(mcsbase + i));
         }
 }
 
@@ -232,9 +232,9 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                         (rf ? 8 : 0)] + ((index < 2) ?
                                         powerbase0[rf] :
                                         powerbase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("RTK better "
-                                "performance, writeval(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "RTK better performance, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 1:
                         if (rtlphy->pwrgroup_cnt == 1)
@@ -253,33 +253,31 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                                 powerbase0[rf] :
                                                 powerbase1[rf]);
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("Realtek regulatory, "
-                                        "20MHz, writeval(%c) = 0x%x\n",
-                                        ((rf == 0) ? 'A' : 'B'),
-                                        writeval));
+                                        "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B', writeval);
                         }
                         break;
                 case 2:
                         writeval = ((index < 2) ? powerbase0[rf] :
                                    powerbase1[rf]);
-                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("Better regulatory, "
-                                "writeval(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                        RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
+                                "Better regulatory, writeval(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 case 3:
                         chnlgroup = 0;
                         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 40MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 40MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht40[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         } else {
                                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                        ("customer's limit, 20MHz rf(%c) = "
-                                        "0x%x\n", ((rf == 0) ? 'A' : 'B'),
+                                        "customer's limit, 20MHz rf(%c) = 0x%x\n",
+                                        rf == 0 ? 'A' : 'B',
                                         rtlefuse->pwrgroup_ht20[rf]
-                                        [channel - 1]));
+                                        [channel - 1]);
                         }
                         for (i = 0; i < 4; i++) {
                                 pwr_diff_limit[i] =
@@ -308,13 +306,13 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                          (pwr_diff_limit[1] << 8) |
                                          (pwr_diff_limit[0]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer's limit rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), customer_limit));
+                                "Customer's limit rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', customer_limit);
                         writeval = customer_limit + ((index < 2) ?
                                    powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("Customer, writeval rf(%c)= 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                                "Customer, writeval rf(%c)= 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 default:
                         chnlgroup = 0;
@@ -323,9 +321,8 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
                                    (rf ? 8 : 0)] + ((index < 2) ?
                                    powerbase0[rf] : powerbase1[rf]);
                         RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                                ("RTK better performance, writeval "
-                                "rf(%c) = 0x%x\n",
-                                ((rf == 0) ? 'A' : 'B'), writeval));
+                                "RTK better performance, writeval rf(%c) = 0x%x\n",
+                                rf == 0 ? 'A' : 'B', writeval);
                         break;
                 }
                 *(p_outwriteval + rf) = writeval;
@@ -367,7 +364,7 @@ static void _rtl92d_write_ofdm_power_reg(struct ieee80211_hw *hw,
                         regoffset = regoffset_b[index];
                 rtl_set_bbreg(hw, regoffset, BMASKDWORD, writeval);
                 RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
-                        ("Set 0x%x = %08x\n", regoffset, writeval));
+                        "Set 0x%x = %08x\n", regoffset, writeval);
                 if (((get_rf_type(rtlphy) == RF_2T2R) &&
                     (regoffset == RTXAGC_A_MCS15_MCS12 ||
                     regoffset == RTXAGC_B_MCS15_MCS12)) ||
@@ -423,11 +420,11 @@ bool rtl92d_phy_enable_anotherphy(struct ieee80211_hw *hw, bool bmac0)
 
         rtlhal->during_mac0init_radiob = false;
         rtlhal->during_mac1init_radioa = false;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("===>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "===>\n");
         /* MAC0 Need PHY1 load radio_b.txt . Driver use DBI to write. */
         u1btmp = rtl_read_byte(rtlpriv, mac_reg);
         if (!(u1btmp & mac_on_bit)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("enable BB & RF\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "enable BB & RF\n");
                 /* Enable BB and RF power */
                 rtl92de_write_dword_dbi(hw, REG_SYS_ISO_CTRL,
                         rtl92de_read_dword_dbi(hw, REG_SYS_ISO_CTRL, direct) |
@@ -437,7 +434,7 @@ bool rtl92d_phy_enable_anotherphy(struct ieee80211_hw *hw, bool bmac0)
                  * and radio_b.txt has been load. */
                 bresult = false;
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<===\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<===\n");
         return bresult;
 
 }
@@ -453,17 +450,17 @@ void rtl92d_phy_powerdown_anotherphy(struct ieee80211_hw *hw, bool bmac0)
 
         rtlhal->during_mac0init_radiob = false;
         rtlhal->during_mac1init_radioa = false;
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("====>\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "====>\n");
         /* check MAC0 enable or not again now, if
          * enabled, not power down radio A. */
         u1btmp = rtl_read_byte(rtlpriv, mac_reg);
         if (!(u1btmp & mac_on_bit)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("power down\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "power down\n");
                 /* power down RF radio A according to YuNan's advice. */
                 rtl92de_write_dword_dbi(hw, RFPGA0_XA_LSSIPARAMETER,
                                         0x00000000, direct);
         }
-        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, ("<====\n"));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_LOUD, "<====\n");
 }
 
 bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
@@ -606,7 +603,7 @@ bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
                 }
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                                ("Radio[%d] Fail!!", rfpath));
+                                 "Radio[%d] Fail!!", rfpath);
                         goto phy_rf_cfg_fail;
                 }
 
@@ -620,7 +617,7 @@ bool rtl92d_phy_rf6052_config(struct ieee80211_hw *hw)
                 rtl92d_phy_powerdown_anotherphy(hw, false);
         else if (need_pwrdown_radiob)
                 rtl92d_phy_powerdown_anotherphy(hw, true);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("<---\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "<---\n");
         return rtstatus;
 
 phy_rf_cfg_fail:
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/rf.h b/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
index 74b9cfc39a83..0fe1a48593e8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/rf.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 7911c9c87085..4898c502974d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.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,11 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
@@ -44,6 +39,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -94,7 +91,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         u8 tid;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
         static int header_print;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -154,9 +150,9 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
         if (!rtlpriv->psc.inactiveps)
-                pr_info("rtl8192ce: Power Save off (module option)\n");
+                pr_info("Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
-                pr_info("rtl8192ce: FW Power Save off (module option)\n");
+                pr_info("FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -170,41 +166,38 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         else if (rtlpriv->psc.reg_fwctrl_lps == 3)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
+        /* for early mode */
+        rtlpriv->rtlhal.earlymode_enable = true;
+        for (tid = 0; tid < 8; tid++)
+                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
+
+        /* Only load firmware for first MAC */
+        if (header_print)
+                return 0;
+
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
 
-        if (!header_print) {
-                pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
-                pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
-                header_print++;
-        }
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
+        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+        header_print++;
+
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                               rtlpriv->io.dev);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x8000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
 
-        /* for early mode */
-        rtlpriv->rtlhal.earlymode_enable = true;
-        for (tid = 0; tid < 8; tid++)
-                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
         return 0;
 }
 
@@ -424,7 +417,7 @@ static int __init rtl92de_module_init(void)
 
         ret = pci_register_driver(&rtl92de_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
         return ret;
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.h b/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
index c95e47de1346..0e6035b8fd86 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/table.c b/drivers/net/wireless/rtlwifi/rtl8192de/table.c
index bad7f9449ecf..8ea6f528dfa6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/table.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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/table.h b/drivers/net/wireless/rtlwifi/rtl8192de/table.h
index 93f30ca62d8f..8b724a86117a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/table.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 3637c0c33525..a7f6126e2f86 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.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
@@ -602,8 +602,8 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                                            EM_HDR_LEN);
                         if (ptcb_desc->empkt_num) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_LOUD,
-                                         ("Insert 8 byte.pTcb->EMPktNum:%d\n",
-                                          ptcb_desc->empkt_num));
+                                         "Insert 8 byte.pTcb->EMPktNum:%d\n",
+                                         ptcb_desc->empkt_num);
                                 _rtl92de_insert_emcontent(ptcb_desc,
                                                           (u8 *)(skb->data));
                         }
@@ -700,7 +700,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                 if (ieee80211_is_data_qos(fc)) {
                         if (mac->rdg_en) {
                                 RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
-                                        ("Enable RDG function.\n"));
+                                         "Enable RDG function\n");
                                 SET_TX_DESC_RDG_ENABLE(pdesc, 1);
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
@@ -726,7 +726,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
                 SET_TX_DESC_PKT_ID(pdesc, 8);
         }
         SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
@@ -776,7 +776,7 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
         }
 
         RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
-                      "H2C Tx Cmd Content\n", pdesc, TX_DESC_SIZE);
+                      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);
         wmb();
         SET_TX_DESC_OWN(pdesc, 1);
 }
@@ -793,8 +793,8 @@ void rtl92de_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d"
-                                          " not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -813,8 +813,8 @@ void rtl92de_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -833,8 +833,8 @@ u32 rtl92de_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(p_desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -847,8 +847,8 @@ u32 rtl92de_get_desc(u8 *p_desc, bool istx, u8 desc_name)
                         ret = GET_RX_DESC_PKT_LEN(pdesc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d "
-                                          "not process\n", desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
index 4d55d0b6816d..0dc736c2723b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
index c6c044816d39..d1b0a1e14971 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 4203a8531ca0..fbabae17259e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.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
@@ -170,9 +170,9 @@ static void _rtl92s_dm_txpowertracking_callback_thermalmeter(
         thermalvalue = (u8)rtl_get_rfreg(hw, RF90_PATH_A, RF_T_METER, 0x1f);
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("Readback Thermal Meter = 0x%x pre thermal meter 0x%x "
-                  "eeprom_thermalmeter 0x%x\n", thermalvalue,
-                  rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter));
+                 "Readback Thermal Meter = 0x%x pre thermal meter 0x%x eeprom_thermal meter 0x%x\n",
+                 thermalvalue,
+                 rtlpriv->dm.thermalvalue, rtlefuse->eeprom_thermalmeter);
 
         if (thermalvalue) {
                 rtlpriv->dm.thermalvalue = thermalvalue;
@@ -282,11 +282,11 @@ static void _rtl92s_dm_refresh_rateadaptive_mask(struct ieee80211_hw *hw)
                 }
 
                 if (ra->pre_ratr_state != ra->ratr_state) {
-                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD, ("RSSI = %ld "
-                                "RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
-                                rtlpriv->dm.undecorated_smoothed_pwdb,
-                                ra->ratr_state,
-                                ra->pre_ratr_state, ra->ratr_state));
+                        RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
+                                 "RSSI = %ld RSSI_LEVEL = %d PreState = %d, CurState = %d\n",
+                                 rtlpriv->dm.undecorated_smoothed_pwdb,
+                                 ra->ratr_state,
+                                 ra->pre_ratr_state, ra->ratr_state);
 
                         rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
                                                            ra->ratr_state);
@@ -586,7 +586,7 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
         if ((mac->link_state < MAC80211_LINKED) &&
             (rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb == 0)) {
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE,
-                         ("Not connected to any\n"));
+                         "Not connected to any\n");
 
                 rtlpriv->dm.dynamic_txhighpower_lvl = TX_HIGHPWR_LEVEL_NORMAL;
 
@@ -599,22 +599,22 @@ static void _rtl92s_dm_dynamic_txpower(struct ieee80211_hw *hw)
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("AP Client PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "AP Client PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 } else {
                         undecorated_smoothed_pwdb =
                             rtlpriv->dm.undecorated_smoothed_pwdb;
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("STA Default Port PWDB = 0x%lx\n",
-                                  undecorated_smoothed_pwdb));
+                                 "STA Default Port PWDB = 0x%lx\n",
+                                 undecorated_smoothed_pwdb);
                 }
         } else {
                 undecorated_smoothed_pwdb =
                     rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("AP Ext Port PWDB = 0x%lx\n",
-                          undecorated_smoothed_pwdb));
+                         "AP Ext Port PWDB = 0x%lx\n",
+                         undecorated_smoothed_pwdb);
         }
 
         txpwr_threshold_lv2 = TX_POWER_NEAR_FIELD_THRESH_LVL2;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
index 9051a556acc4..e1b19a641765 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
index 3fda6b1dcf46..0d8bf5657008 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.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
@@ -66,7 +66,7 @@ static bool _rtl92s_firmware_enable_cpu(struct ieee80211_hw *hw)
                 cpustatus = rtl_read_byte(rtlpriv, TCR);
                 if (cpustatus & IMEM_RDY) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("IMEM Ready after CPU has refilled.\n"));
+                                 "IMEM Ready after CPU has refilled\n");
                         break;
                 }
 
@@ -120,9 +120,8 @@ static u8 _rtl92s_firmware_header_map_rftype(struct ieee80211_hw *hw)
                 return 0x22;
                 break;
         default:
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Unknown RF type(%x)\n",
-                         rtlphy->rf_type));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown RF type(%x)\n",
+                         rtlphy->rf_type);
                 break;
         }
         return 0x22;
@@ -177,7 +176,7 @@ static bool _rtl92s_firmware_downloadcode(struct ieee80211_hw *hw,
 
         if (buffer_len >= MAX_FIRMWARE_CODE_SIZE) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Size over FIRMWARE_CODE_SIZE!\n"));
+                         "Size over FIRMWARE_CODE_SIZE!\n");
 
                 return false;
         }
@@ -231,8 +230,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
         short pollingcnt = 1000;
         bool rtstatus = true;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("LoadStaus(%d)\n",
-                 loadfw_status));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "LoadStaus(%d)\n", loadfw_status);
 
         firmware->fwstatus = (enum fw_status)loadfw_status;
 
@@ -248,8 +247,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & IMEM_CHK_RPT) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("FW_STATUS_LOAD_IMEM"
-                                 " FAIL CPU, Status=%x\r\n", cpustatus));
+                                 "FW_STATUS_LOAD_IMEM FAIL CPU, Status=%x\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
                 break;
@@ -266,8 +265,8 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & EMEM_CHK_RPT) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("FW_STATUS_LOAD_EMEM"
-                                 " FAIL CPU, Status=%x\r\n", cpustatus));
+                                 "FW_STATUS_LOAD_EMEM FAIL CPU, Status=%x\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
@@ -275,7 +274,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                 rtstatus = _rtl92s_firmware_enable_cpu(hw);
                 if (rtstatus != true) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Enable CPU fail!\n"));
+                                 "Enable CPU fail!\n");
                         goto status_check_fail;
                 }
                 break;
@@ -291,14 +290,14 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
                 if (!(cpustatus & DMEM_CODE_DONE) || (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Polling  DMEM code done"
-                                 " fail ! cpustatus(%#x)\n", cpustatus));
+                                 "Polling DMEM code done fail ! cpustatus(%#x)\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("DMEM code download success,"
-                        " cpustatus(%#x)\n", cpustatus));
+                         "DMEM code download success, cpustatus(%#x)\n",
+                         cpustatus);
 
                 /* Prevent Delay too much and being scheduled out */
                 /* Polling Load Firmware ready */
@@ -311,14 +310,14 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                 } while (pollingcnt--);
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Polling Load Firmware ready,"
-                        " cpustatus(%x)\n",     cpustatus));
+                         "Polling Load Firmware ready, cpustatus(%x)\n",
+                         cpustatus);
 
                 if (((cpustatus & LOAD_FW_READY) != LOAD_FW_READY) ||
                     (pollingcnt <= 0)) {
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Polling Load Firmware"
-                                " ready fail ! cpustatus(%x)\n", cpustatus));
+                                 "Polling Load Firmware ready fail ! cpustatus(%x)\n",
+                                 cpustatus);
                         goto status_check_fail;
                 }
 
@@ -332,7 +331,7 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
                                 RCR_APP_ICV | RCR_APP_MIC));
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                         ("Current RCR settings(%#x)\n", tmpu4b));
+                         "Current RCR settings(%#x)\n", tmpu4b);
 
                 /* Set to normal mode. */
                 rtl_write_byte(rtlpriv, LBKMD_SEL, LBK_NORMAL);
@@ -340,14 +339,15 @@ static bool _rtl92s_firmware_checkready(struct ieee80211_hw *hw,
 
         default:
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Unknown status check!\n"));
+                         "Unknown status check!\n");
                 rtstatus = false;
                 break;
         }
 
 status_check_fail:
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("loadfw_status(%d), "
-                 "rtstatus(%x)\n", loadfw_status, rtstatus));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "loadfw_status(%d), rtstatus(%x)\n",
+                 loadfw_status, rtstatus);
         return rtstatus;
 }
 
@@ -364,7 +364,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         u8 fwstatus = FW_STATUS_INIT;
         bool rtstatus = true;
 
-        if (!rtlhal->pfirmware)
+        if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
 
         firmware = (struct rt_firmware *)rtlhal->pfirmware;
@@ -378,17 +378,17 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         firmware->firmwareversion =  byte(pfwheader->version, 0);
         firmware->pfwheader->fwpriv.hci_sel = 1;/* pcie */
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("signature:%x, version:"
-                 "%x, size:%x,"
-                 "imemsize:%x, sram size:%x\n", pfwheader->signature,
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n",
+                 pfwheader->signature,
                  pfwheader->version, pfwheader->dmem_size,
-                 pfwheader->img_imem_size, pfwheader->img_sram_size));
+                 pfwheader->img_imem_size, pfwheader->img_sram_size);
 
         /* 2. Retrieve IMEM image. */
         if ((pfwheader->img_imem_size == 0) || (pfwheader->img_imem_size >
             sizeof(firmware->fw_imem))) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("memory for data image is less than IMEM required\n"));
+                         "memory for data image is less than IMEM required\n");
                 goto fail;
         } else {
                 puc_mappedfile += fwhdr_size;
@@ -401,7 +401,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
         /* 3. Retriecve EMEM image. */
         if (pfwheader->img_sram_size > sizeof(firmware->fw_emem)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("memory for data image is less than EMEM required\n"));
+                         "memory for data image is less than EMEM required\n");
                 goto fail;
         } else {
                 puc_mappedfile += firmware->fw_imem_len;
@@ -436,7 +436,7 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("Unexpected Download step!!\n"));
+                                 "Unexpected Download step!!\n");
                         goto fail;
                         break;
                 }
@@ -446,14 +446,14 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
                                 ul_filelength);
 
                 if (rtstatus != true) {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("fail!\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n");
                         goto fail;
                 }
 
                 /* <3> Check whether load FW process is ready */
                 rtstatus = _rtl92s_firmware_checkready(hw, fwstatus);
                 if (rtstatus != true) {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("fail!\n"));
+                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "fail!\n");
                         goto fail;
                 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index 74cc503efe8a..babe85d4b694 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index c474486e3911..22098c2f38f1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.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 "../wifi.h"
 #include "../efuse.h"
 #include "../base.h"
@@ -80,8 +78,8 @@ void rtl92se_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         default: {
-                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "switch case not processed\n");
                         break;
                 }
         }
@@ -140,7 +138,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 e_aci;
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("HW_VAR_SLOT_TIME %x\n", val[0]));
+                                 "HW_VAR_SLOT_TIME %x\n", val[0]);
 
                         rtl_write_byte(rtlpriv, SLOT_TIME, val[0]);
 
@@ -185,8 +183,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 *val = min_spacing_to_set;
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
-                                          mac->min_space_cfg));
+                                         "Set HW_VAR_AMPDU_MIN_SPACE: %#x\n",
+                                         mac->min_space_cfg);
 
                                 rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                                mac->min_space_cfg);
@@ -201,8 +199,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                 ("Set HW_VAR_SHORTGI_DENSITY: %#x\n",
-                                  mac->min_space_cfg));
+                                 "Set HW_VAR_SHORTGI_DENSITY: %#x\n",
+                                 mac->min_space_cfg);
 
                         rtl_write_byte(rtlpriv, AMPDU_MIN_SPACE,
                                        mac->min_space_cfg);
@@ -244,8 +242,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 rtl_write_byte(rtlpriv, AGGLEN_LMT_H, regtoset);
 
                                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
-                                         ("Set HW_VAR_AMPDU_FACTOR: %#x\n",
-                                          factor_toset));
+                                         "Set HW_VAR_AMPDU_FACTOR: %#x\n",
+                                         factor_toset);
                         }
                         break;
                 }
@@ -282,8 +280,8 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("HW_VAR_ACM_CTRL acm set "
-                                                  "failed: eACI is %d\n", acm));
+                                                 "HW_VAR_ACM_CTRL acm set failed: eACI is %d\n",
+                                                 acm);
                                         break;
                                 }
                         } else {
@@ -299,13 +297,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                         break;
                                 default:
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                                 ("switch case not process\n"));
+                                                 "switch case not processed\n");
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_QOS, DBG_TRACE,
-                                 ("HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl));
+                                 "HW_VAR_ACM_CTRL Write 0x%X\n", acm_ctrl);
                         rtl_write_byte(rtlpriv, AcmHwCtrl, acm_ctrl);
                         break;
                 }
@@ -404,7 +402,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
 
@@ -415,14 +413,14 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 sec_reg_value = 0x0;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("PairwiseEncAlgorithm = %d "
-                 "GroupEncAlgorithm = %d\n",
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n",
                  rtlpriv->sec.pairwise_enc_algorithm,
-                 rtlpriv->sec.group_enc_algorithm));
+                 rtlpriv->sec.group_enc_algorithm);
 
         if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                         ("not open hw encryption\n"));
+                         "not open hw encryption\n");
                 return;
         }
 
@@ -433,8 +431,8 @@ void rtl92se_enable_hw_security_config(struct ieee80211_hw *hw)
                 sec_reg_value |= SCR_RXUSEDK;
         }
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, ("The SECR-value %x\n",
-                        sec_reg_value));
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "The SECR-value %x\n",
+                 sec_reg_value);
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_WPA_CONFIG, &sec_reg_value);
 
@@ -718,8 +716,8 @@ static void _rtl92se_macconfig_before_fwdownload(struct ieee80211_hw *hw)
 
         if (pollingcnt <= 0) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Polling TXDMA_INIT_VALUE "
-                         "timeout!! Current TCR(%#x)\n", tmpu1b));
+                         "Polling TXDMA_INIT_VALUE timeout!! Current TCR(%#x)\n",
+                         tmpu1b);
                 tmpu1b = rtl_read_byte(rtlpriv, CMDR);
                 rtl_write_byte(rtlpriv, CMDR, tmpu1b & (~TXDMA_EN));
                 udelay(2);
@@ -870,10 +868,10 @@ static void _rtl92se_macconfig_after_fwdownload(struct ieee80211_hw *hw)
 
                 /* Change Program timing */
                 rtl_write_byte(rtlpriv, REG_EFUSE_CTRL + 3, 0x72);
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("EFUSE CONFIG OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "EFUSE CONFIG OK\n");
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("OK\n"));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "OK\n");
 
 }
 
@@ -951,12 +949,9 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
         rtstatus = rtl92s_download_fw(hw);
         if (!rtstatus) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("Failed to download FW. "
-                         "Init HW without FW now.., Please copy FW into"
-                         "/lib/firmware/rtlwifi\n"));
-                rtlhal->fw_ready = false;
-        } else {
-                rtlhal->fw_ready = true;
+                         "Failed to download FW. Init HW without FW now... "
+                         "Please copy FW into /lib/firmware/rtlwifi\n");
+                return 1;
         }
 
         /* After FW download, we have to reset MAC register */
@@ -968,7 +963,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         /* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */
         if (rtl92s_phy_mac_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("MAC Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n");
                 return rtstatus;
         }
 
@@ -978,7 +973,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
 
         /* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */
         if (rtl92s_phy_bb_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, ("BB Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n");
                 return rtstatus;
         }
 
@@ -1014,7 +1009,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw)
                 rtl_write_byte(rtlpriv, RF_CTRL, 0x07);
 
         if (rtl92s_phy_rf_config(hw) != true) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("RF Config failed\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");
                 return rtstatus;
         }
 
@@ -1129,26 +1124,26 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
         case NL80211_IFTYPE_UNSPECIFIED:
                 bt_msr |= (MSR_LINK_NONE << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to NO LINK!\n"));
+                         "Set Network type to NO LINK!\n");
                 break;
         case NL80211_IFTYPE_ADHOC:
                 bt_msr |= (MSR_LINK_ADHOC << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to Ad Hoc!\n"));
+                         "Set Network type to Ad Hoc!\n");
                 break;
         case NL80211_IFTYPE_STATION:
                 bt_msr |= (MSR_LINK_MANAGED << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to STA!\n"));
+                         "Set Network type to STA!\n");
                 break;
         case NL80211_IFTYPE_AP:
                 bt_msr |= (MSR_LINK_MASTER << MSR_LINK_SHIFT);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                         ("Set Network type to AP!\n"));
+                         "Set Network type to AP!\n");
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Network type %d not support!\n", type));
+                         "Network type %d not supported!\n", type);
                 return 1;
                 break;
 
@@ -1202,7 +1197,7 @@ void rtl92se_set_qos(struct ieee80211_hw *hw, int aci)
                 rtl_write_dword(rtlpriv, EDCAPARA_VO, 0x2f3222);
                 break;
         default:
-                RT_ASSERT(false, ("invalid aci: %d !\n", aci));
+                RT_ASSERT(false, "invalid aci: %d !\n", aci);
                 break;
         }
 }
@@ -1219,9 +1214,14 @@ void rtl92se_enable_interrupt(struct ieee80211_hw *hw)
 
 void rtl92se_disable_interrupt(struct ieee80211_hw *hw)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
+        struct rtl_priv *rtlpriv;
+        struct rtl_pci *rtlpci;
 
+        rtlpriv = rtl_priv(hw);
+        /* if firmware not available, no interrupts */
+        if (!rtlpriv || !rtlpriv->max_fw_size)
+                return;
+        rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         rtl_write_dword(rtlpriv, INTA_MASK, 0);
         rtl_write_dword(rtlpriv, INTA_MASK + 4, 0);
 
@@ -1583,8 +1583,8 @@ void rtl92se_update_interrupt_mask(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
-        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD,
-                 ("add_msr:%x, rm_msr:%x\n", add_msr, rm_msr));
+        RT_TRACE(rtlpriv, COMP_INTR, DBG_LOUD, "add_msr:%x, rm_msr:%x\n",
+                 add_msr, rm_msr);
 
         if (add_msr)
                 rtlpci->irq_mask[0] |= add_msr;
@@ -1627,7 +1627,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         if (rtlefuse->epromtype == EEPROM_93C46) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("RTL819X Not boot from eeprom, check it !!"));
+                         "RTL819X Not boot from eeprom, check it !!\n");
         } else if (rtlefuse->epromtype == EEPROM_BOOT_EFUSE) {
                 rtl_efuse_shadow_map_update(hw);
 
@@ -1636,16 +1636,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                         HWSET_MAX_SIZE_92S);
         }
 
-        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),
+        RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",
                       hwinfo, HWSET_MAX_SIZE_92S);
 
         eeprom_id = *((u16 *)&hwinfo[0]);
         if (eeprom_id != RTL8190_EEPROM_ID) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                         ("EEPROM ID(%#x) is invalid!!\n", eeprom_id));
+                         "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
                 rtlefuse->autoload_failflag = true;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
         }
 
@@ -1663,15 +1663,15 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROMId = 0x%4x\n", eeprom_id));
+                 "EEPROMId = 0x%4x\n", eeprom_id);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid));
+                 "EEPROM VID = 0x%4x\n", rtlefuse->eeprom_vid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did));
+                 "EEPROM DID = 0x%4x\n", rtlefuse->eeprom_did);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid));
+                 "EEPROM SVID = 0x%4x\n", rtlefuse->eeprom_svid);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                        ("EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid));
+                 "EEPROM SMID = 0x%4x\n", rtlefuse->eeprom_smid);
 
         for (i = 0; i < 6; i += 2) {
                 usvalue = *(u16 *)&hwinfo[EEPROM_MAC_ADDR + i];
@@ -1681,8 +1681,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         for (i = 0; i < 6; i++)
                 rtl_write_byte(rtlpriv, MACIDR0 + i, rtlefuse->dev_addr[i]);
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                 ("%pM\n", rtlefuse->dev_addr));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%pM\n", rtlefuse->dev_addr);
 
         /* Get Tx Power Level by Channel */
         /* Read Tx power of Channel 1 ~ 14 from EEPROM. */
@@ -1707,23 +1706,24 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path,
-                                i, rtlefuse->eeprom_chnlarea_txpwr_cck
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_cck
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
-                                                [rf_path][i]));
+                                "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
+                                [rf_path][i]);
         for (rf_path = 0; rf_path < 2; rf_path++)
                 for (i = 0; i < 3; i++)
                         RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
-                                ("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
-                                        [rf_path][i]));
+                                "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
+                                [rf_path][i]);
 
         for (rf_path = 0; rf_path < 2; rf_path++) {
 
@@ -1754,11 +1754,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
                 for (i = 0; i < 14; i++) {
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
-                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
-                                 rtlefuse->txpwrlevel_cck[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
-                                 rtlefuse->txpwrlevel_ht40_2s[rf_path][i]));
+                                "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
+                                rf_path, i,
+                                rtlefuse->txpwrlevel_cck[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
+                                rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
                 }
         }
 
@@ -1791,13 +1791,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                 0xf0) >> 4);
 
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht20[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht20[rf_path][i]));
+                                "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht20[rf_path][i]);
                         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                                ("RF-%d pwrgroup_ht40[%d] = 0x%x\n",
-                                 rf_path, i,
-                                 rtlefuse->pwrgroup_ht40[rf_path][i]));
+                                "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
+                                rf_path, i,
+                                rtlefuse->pwrgroup_ht40[rf_path][i]);
                         }
         }
 
@@ -1852,27 +1852,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                                  (hwinfo[EEPROM_REGULATORY] & 0x1);
         }
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                ("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory));
+                "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]));
+                        "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]));
+                        "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]));
+                        "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
                 RTPRINT(rtlpriv, FINIT, INIT_TxPower,
-                        ("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
-                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]));
+                        "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
+                        i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPwrSafetyFlag = %d\n",
-                rtlefuse->txpwr_safetyflag));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPwrSafetyFlag = %d\n", rtlefuse->txpwr_safetyflag);
 
         /* Read RF-indication and Tx Power gain
          * index diff of legacy to HT OFDM rate. */
@@ -1881,8 +1881,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPowerDiff = %#x\n",
-                rtlefuse->eeprom_txpowerdiff));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "TxPowerDiff = %#x\n", rtlefuse->eeprom_txpowerdiff);
 
         /* Get TSSI value for each path. */
         usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
@@ -1890,16 +1890,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B];
         rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
 
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
-                 rtlefuse->eeprom_tssi[RF90_PATH_A],
-                 rtlefuse->eeprom_tssi[RF90_PATH_B]));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
+                rtlefuse->eeprom_tssi[RF90_PATH_A],
+                rtlefuse->eeprom_tssi[RF90_PATH_B]);
 
         /* Read antenna tx power offset of B/C/D to A  from EEPROM */
         /* and read ThermalMeter from EEPROM */
         tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("thermalmeter = 0x%x\n",
-                rtlefuse->eeprom_thermalmeter));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 
         /* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */
         rtlefuse->thermalmeter[0] = (rtlefuse->eeprom_thermalmeter & 0x1f);
@@ -1915,8 +1915,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Version ID, Channel plan */
         rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("EEPROM ChannelPlan = 0x%4x\n",
-                rtlefuse->eeprom_channelplan));
+        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
         tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];
@@ -1937,14 +1937,14 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 if (!(tempval & BIT(0))) {
                         rtlefuse->b1x1_recvcombine = true;
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                                ("RF_TYPE=1T2R but only 1SS\n"));
+                                 "RF_TYPE=1T2R but only 1SS\n");
                 }
         }
         rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
         rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMID];
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("EEPROM Customer ID: 0x%2x",
-                        rtlefuse->eeprom_oemid));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x",
+                 rtlefuse->eeprom_oemid);
 
         /* set channel paln to world wide 13 */
         rtlefuse->channel_plan = COUNTRY_CODE_WORLD_WIDE_13;
@@ -1959,19 +1959,19 @@ void rtl92se_read_eeprom_info(struct ieee80211_hw *hw)
         tmp_u1b = rtl_read_byte(rtlpriv, EPROM_CMD);
 
         if (tmp_u1b & BIT(4)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EEPROM\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EEPROM\n");
                 rtlefuse->epromtype = EEPROM_93C46;
         } else {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Boot from EFUSE\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Boot from EFUSE\n");
                 rtlefuse->epromtype = EEPROM_BOOT_EFUSE;
         }
 
         if (tmp_u1b & BIT(5)) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Autoload OK\n"));
+                RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
                 rtlefuse->autoload_failflag = false;
                 _rtl92se_read_adapter_info(hw);
         } else {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Autoload ERR!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Autoload ERR!!\n");
                 rtlefuse->autoload_failflag = true;
         }
 }
@@ -2071,8 +2071,8 @@ static void rtl92se_update_hal_rate_table(struct ieee80211_hw *hw,
         else
                 rtl92s_phy_set_fw_cmd(hw, FW_CMD_RA_REFRESH_BG);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,
-                 ("%x\n", rtl_read_dword(rtlpriv, ARFR0)));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, "%x\n",
+                 rtl_read_dword(rtlpriv, ARFR0));
 }
 
 static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
@@ -2224,8 +2224,8 @@ static void rtl92se_update_hal_rate_mask(struct ieee80211_hw *hw,
 
         mask |= (bmulticast ? 1 : 0) << 9 | (macid & 0x1f) << 4 | (band & 0xf);
 
-        RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, ("mask = %x, bitmap = %x\n",
-                        mask, ratr_bitmap));
+        RT_TRACE(rtlpriv, COMP_RATR, DBG_TRACE, "mask = %x, bitmap = %x\n",
+                 mask, ratr_bitmap);
         rtl_write_dword(rtlpriv, 0x2c4, ratr_bitmap);
         rtl_write_dword(rtlpriv, WFM5, (FW_RA_UPDATE_MASK | (mask << 8)));
 
@@ -2301,14 +2301,14 @@ bool rtl92se_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid)
 
         if ((ppsc->hwradiooff) && (rfpwr_toset == ERFON)) {
                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("RFKILL-HW Radio ON, RF ON\n"));
+                         "RFKILL-HW Radio ON, RF ON\n");
 
                 rfpwr_toset = ERFON;
                 ppsc->hwradiooff = false;
                 actuallyset = true;
         } else if ((ppsc->hwradiooff == false) && (rfpwr_toset == ERFOFF)) {
-                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                         ("RFKILL-HW Radio OFF, RF OFF\n"));
+                RT_TRACE(rtlpriv, COMP_RF,
+                         DBG_DMESG, "RFKILL-HW Radio OFF, RF OFF\n");
 
                 rfpwr_toset = ERFOFF;
                 ppsc->hwradiooff = true;
@@ -2372,7 +2372,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                 u8 cam_offset = 0;
                 u8 clear_number = 5;
 
-                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, ("clear_all\n"));
+                RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "clear_all\n");
 
                 for (idx = 0; idx < clear_number; idx++) {
                         rtl_cam_mark_invalid(hw, cam_offset + idx);
@@ -2401,7 +2401,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                        ("switch case not process\n"));
+                                 "switch case not processed\n");
                         enc_algo = CAM_TKIP;
                         break;
                 }
@@ -2419,9 +2419,8 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                                                                  p_macaddr);
                                         if (entry_id >=  TOTAL_CAM_ENTRY) {
                                                 RT_TRACE(rtlpriv,
-                                                   COMP_SEC, DBG_EMERG,
-                                                   ("Can not find free hw"
-                                                   " security cam entry\n"));
+                                                         COMP_SEC, DBG_EMERG,
+                                                         "Can not find free hw security cam entry\n");
                                                 return;
                                         }
                                 } else {
@@ -2435,30 +2434,31 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
 
                 if (rtlpriv->sec.key_len[key_index] == 0) {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("delete one entry, entry_id is %d\n",
-                                 entry_id));
+                                 "delete one entry, entry_id is %d\n",
+                                 entry_id);
                         if (mac->opmode == NL80211_IFTYPE_AP)
                                 rtl_cam_del_entry(hw, p_macaddr);
                         rtl_cam_delete_one_entry(hw, p_macaddr, entry_id);
                 } else {
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY length is %d\n",
-                                  rtlpriv->sec.key_len[PAIRWISE_KEYIDX]));
+                                 "The insert KEY length is %d\n",
+                                 rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
-                                 ("The insert KEY  is %x %x\n",
-                                  rtlpriv->sec.key_buf[0][0],
-                                  rtlpriv->sec.key_buf[0][1]));
+                                 "The insert KEY is %x %x\n",
+                                 rtlpriv->sec.key_buf[0][0],
+                                 rtlpriv->sec.key_buf[0][1]);
 
                         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                 ("add one entry\n"));
+                                 "add one entry\n");
                         if (is_pairwise) {
                                 RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,
-                                      "Pairwiase Key content :",
-                                       rtlpriv->sec.pairwise_key,
-                                       rtlpriv->sec.key_len[PAIRWISE_KEYIDX]);
+                                              "Pairwise Key content",
+                                              rtlpriv->sec.pairwise_key,
+                                              rtlpriv->sec.
+                                              key_len[PAIRWISE_KEYIDX]);
 
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set Pairwiase key\n"));
+                                         "set Pairwise key\n");
 
                                 rtl_cam_add_one_entry(hw, macaddr, key_index,
                                         entry_id, enc_algo,
@@ -2466,7 +2466,7 @@ void rtl92se_set_key(struct ieee80211_hw *hw, u32 key_index, u8 *p_macaddr,
                                         rtlpriv->sec.key_buf[key_index]);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
-                                         ("set group key\n"));
+                                         "set group key\n");
 
                                 if (mac->opmode == NL80211_IFTYPE_ADHOC) {
                                         rtl_cam_add_one_entry(hw,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
index 6160a9bfe98a..1886c2644a26 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/led.c b/drivers/net/wireless/rtlwifi/rtl8192se/led.c
index e3fe7c90ebf4..44949b5cbb87 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/led.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/led.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
@@ -52,8 +52,8 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
         u8 ledcfg;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", LEDCFG, pled->ledpin));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 LEDCFG, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -68,7 +68,7 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = true;
@@ -76,12 +76,15 @@ void rtl92se_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled)
 
 void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
 {
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_priv *rtlpriv;
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         u8 ledcfg;
 
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD,
-                 ("LedAddr:%X ledpin=%d\n", LEDCFG, pled->ledpin));
+        rtlpriv = rtl_priv(hw);
+        if (!rtlpriv || rtlpriv->max_fw_size)
+                return;
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "LedAddr:%X ledpin=%d\n",
+                 LEDCFG, pled->ledpin);
 
         ledcfg = rtl_read_byte(rtlpriv, LEDCFG);
 
@@ -101,7 +104,7 @@ void rtl92se_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 break;
         }
         pled->ledon = false;
@@ -141,8 +144,7 @@ void rtl92se_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction)
             ledaction == LED_CTL_POWER_ON)) {
                 return;
         }
-        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n",
-                 ledaction));
+        RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, "ledaction %d\n", ledaction);
 
         _rtl92se_sw_led_control(hw, ledaction);
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/led.h b/drivers/net/wireless/rtlwifi/rtl8192se/led.h
index 8cce3870af3c..2182dbeb5f32 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/led.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/led.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index f10ac1ad9087..05b4e2790e99 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.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 "../wifi.h"
 #include "../pci.h"
 #include "../ps.h"
@@ -58,16 +56,15 @@ u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 returnvalue = 0, originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x)\n",
-                        regaddr, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), bitmask(%#x)\n",
+                 regaddr, bitmask);
 
         originalvalue = rtl_read_dword(rtlpriv, regaddr);
         bitshift = _rtl92s_phy_calculate_bit_shift(bitmask);
         returnvalue = (originalvalue & bitmask) >> bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
-                 ("BBR MASK=0x%x Addr[0x%x]=0x%x\n",
-                 bitmask, regaddr, originalvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
+                 bitmask, regaddr, originalvalue);
 
         return returnvalue;
 
@@ -79,8 +76,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 originalvalue, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                        " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
         if (bitmask != MASKDWORD) {
                 originalvalue = rtl_read_dword(rtlpriv, regaddr);
@@ -90,8 +88,9 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,
 
         rtl_write_dword(rtlpriv, regaddr, data);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                        " data(%#x)\n", regaddr, bitmask, data));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x)\n",
+                 regaddr, bitmask, data);
 
 }
 
@@ -149,8 +148,8 @@ static u32 _rtl92s_phy_rf_serial_read(struct ieee80211_hw *hw,
         retvalue = rtl_get_bbreg(hw, pphyreg->rflssi_readback,
                                  BLSSI_READBACK_DATA);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFR-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rflssi_readback, retvalue));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFR-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rflssi_readback, retvalue);
 
         return retvalue;
 
@@ -172,8 +171,8 @@ static void _rtl92s_phy_rf_serial_write(struct ieee80211_hw *hw,
         data_and_addr = ((newoffset << 20) | (data & 0x000fffff)) & 0x0fffffff;
         rtl_set_bbreg(hw, pphyreg->rf3wire_offset, MASKDWORD, data_and_addr);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("RFW-%d Addr[0x%x]=0x%x\n",
-                 rfpath, pphyreg->rf3wire_offset, data_and_addr));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, "RFW-%d Addr[0x%x]=0x%x\n",
+                 rfpath, pphyreg->rf3wire_offset, data_and_addr);
 }
 
 
@@ -183,8 +182,9 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u32 original_value, readback_value, bitshift;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                 "bitmask(%#x)\n", regaddr, rfpath, bitmask));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n",
+                 regaddr, rfpath, bitmask);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -195,9 +195,9 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), rfpath(%#x), "
-                 "bitmask(%#x), original_value(%#x)\n", regaddr, rfpath,
-                 bitmask, original_value));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
+                 regaddr, rfpath, bitmask, original_value);
 
         return readback_value;
 }
@@ -212,8 +212,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
         if (!((rtlphy->rf_pathmap >> rfpath) & 0x1))
                 return;
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x),"
-                 " data(%#x), rfpath(%#x)\n", regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
         spin_lock(&rtlpriv->locks.rf_lock);
 
@@ -228,8 +229,9 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,
 
         spin_unlock(&rtlpriv->locks.rf_lock);
 
-        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), bitmask(%#x), "
-                 "data(%#x), rfpath(%#x)\n", regaddr, bitmask, data, rfpath));
+        RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE,
+                 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n",
+                 regaddr, bitmask, data, rfpath);
 
 }
 
@@ -249,7 +251,7 @@ void rtl92s_phy_scan_operation_backup(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("Unknown operation.\n"));
+                                 "Unknown operation\n");
                         break;
                 }
         }
@@ -264,9 +266,9 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         u8 reg_bw_opmode;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("Switch to %s bandwidth\n",
-                  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
-                  "20MHz" : "40MHz"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n",
+                 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?
+                 "20MHz" : "40MHz");
 
         if (rtlphy->set_bwmode_inprogress)
                 return;
@@ -290,8 +292,7 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n",
-                         rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
@@ -316,13 +317,13 @@ void rtl92s_phy_set_bw_mode(struct ieee80211_hw *hw,
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw));
+                         "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);
                 break;
         }
 
         rtl92s_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);
         rtlphy->set_bwmode_inprogress = false;
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 }
 
 static bool _rtl92s_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
@@ -332,7 +333,7 @@ static bool _rtl92s_phy_set_sw_chnl_cmdarray(struct swchnlcmd *cmdtable,
         struct swchnlcmd *pcmd;
 
         if (cmdtable == NULL) {
-                RT_ASSERT(false, ("cmdtable cannot be NULL.\n"));
+                RT_ASSERT(false, "cmdtable cannot be NULL\n");
                 return false;
         }
 
@@ -377,7 +378,7 @@ static bool _rtl92s_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
         rfdependcmdcnt = 0;
 
         RT_ASSERT((channel >= 1 && channel <= 14),
-                  ("illegal channel for Zebra: %d\n", channel));
+                  "invalid channel for Zebra: %d\n", channel);
 
         _rtl92s_phy_set_sw_chnl_cmdarray(rfdependcmd, rfdependcmdcnt++,
                                          MAX_RFDEPENDCMD_CNT, CMDID_RF_WRITEREG,
@@ -438,7 +439,7 @@ static bool _rtl92s_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
                         break;
                 default:
                         RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                                 ("switch case not process\n"));
+                                 "switch case not processed\n");
                         break;
                 }
 
@@ -458,9 +459,8 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
         u32 delay;
         bool ret;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,
-                 ("switch to channel%d\n",
-                 rtlphy->current_channel));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "switch to channel%d\n",
+                 rtlphy->current_channel);
 
         if (rtlphy->sw_chnl_inprogress)
                 return 0;
@@ -496,7 +496,7 @@ u8 rtl92s_phy_sw_chnl(struct ieee80211_hw *hw)
 
         rtlphy->sw_chnl_inprogress = false;
 
-        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n"));
+        RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");
 
         return 1;
 }
@@ -556,7 +556,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                 do {
                                         InitializeCount++;
                                         RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                                 ("IPS Set eRf nic enable\n"));
+                                                 "IPS Set eRf nic enable\n");
                                         rtstatus = rtl_ps_enable_nic(hw);
                                 } while ((rtstatus != true) &&
                                          (InitializeCount < 10));
@@ -565,11 +565,11 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                                   RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
                                 RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                         ("awake, sleeped:%d ms "
-                                        "state_inap:%x\n",
-                                        jiffies_to_msecs(jiffies -
-                                        ppsc->last_sleep_jiffies),
-                                        rtlpriv->psc.state_inap));
+                                         "awake, sleeped:%d ms state_inap:%x\n",
+                                         jiffies_to_msecs(jiffies -
+                                                          ppsc->
+                                                          last_sleep_jiffies),
+                                         rtlpriv->psc.state_inap);
                                 ppsc->last_awake_jiffies = jiffies;
                                 rtl_write_word(rtlpriv, CMDR, 0x37FC);
                                 rtl_write_byte(rtlpriv, TXPAUSE, 0x00);
@@ -587,7 +587,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
         case ERFOFF:{
                         if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {
                                 RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
-                                         ("IPS Set eRf nic disable\n"));
+                                         "IPS Set eRf nic disable\n");
                                 rtl_ps_disable_nic(hw);
                                 RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                         } else {
@@ -613,11 +613,9 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                         continue;
                                 } else {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("eRf Off/Sleep: "
-                                                 "%d times TcbBusyQueue[%d] = "
-                                                 "%d before doze!\n",
-                                                 (i + 1), queue_id,
-                                                 skb_queue_len(&ring->queue)));
+                                                 "eRf Off/Sleep: %d times TcbBusyQueue[%d] = %d before doze!\n",
+                                                 i + 1, queue_id,
+                                                 skb_queue_len(&ring->queue));
 
                                         udelay(10);
                                         i++;
@@ -625,31 +623,30 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
                                 if (i >= MAX_DOZE_WAITING_TIMES_9x) {
                                         RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-                                                 ("\nERFOFF: %d times"
-                                                 "TcbBusyQueue[%d] = %d !\n",
+                                                 "ERFOFF: %d times TcbBusyQueue[%d] = %d !\n",
                                                  MAX_DOZE_WAITING_TIMES_9x,
                                                  queue_id,
-                                                 skb_queue_len(&ring->queue)));
+                                                 skb_queue_len(&ring->queue));
                                         break;
                                 }
                         }
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("Set ERFSLEEP awaked:%d ms\n",
+                                 "Set ERFSLEEP awaked:%d ms\n",
                                  jiffies_to_msecs(jiffies -
-                                 ppsc->last_awake_jiffies)));
+                                                  ppsc->last_awake_jiffies));
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG,
-                                 ("sleep awaked:%d ms "
-                                "state_inap:%x\n", jiffies_to_msecs(jiffies -
-                                ppsc->last_awake_jiffies),
-                                rtlpriv->psc.state_inap));
+                                 "sleep awaked:%d ms state_inap:%x\n",
+                                 jiffies_to_msecs(jiffies -
+                                                  ppsc->last_awake_jiffies),
+                                 rtlpriv->psc.state_inap);
                         ppsc->last_sleep_jiffies = jiffies;
                         _rtl92se_phy_set_rf_sleep(hw);
             break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("switch case not process\n"));
+                         "switch case not processed\n");
                 bresult = false;
                 break;
         }
@@ -995,7 +992,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
 
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Write BB Reg Fail!!"));
+                         "Write BB Reg Fail!!\n");
                 goto phy_BB8190_Config_ParaFile_Fail;
         }
 
@@ -1009,8 +1006,7 @@ static bool _rtl92s_phy_bb_config_parafile(struct ieee80211_hw *hw)
         }
         if (rtstatus != true) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("_rtl92s_phy_bb_config_parafile(): "
-                         "BB_PG Reg Fail!!"));
+                         "_rtl92s_phy_bb_config_parafile(): BB_PG Reg Fail!!\n");
                 goto phy_BB8190_Config_ParaFile_Fail;
         }
 
@@ -1053,7 +1049,7 @@ u8 rtl92s_phy_config_rf(struct ieee80211_hw *hw, enum radio_path rfpath)
                 radio_b_tblen = RADIOB_ARRAYLENGTH;
         }
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Radio No %x\n", rfpath));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "Radio No %x\n", rfpath);
         rtstatus = true;
 
         switch (rfpath) {
@@ -1175,11 +1171,11 @@ bool rtl92s_phy_bb_config(struct ieee80211_hw *hw)
             (rtlphy->rf_type == RF_2T2R && rf_num != 2) ||
             (rtlphy->rf_type == RF_2T2R_GREEN && rf_num != 2)) {
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("RF_Type(%x) does not match "
-                         "RF_Num(%x)!!\n", rtlphy->rf_type, rf_num));
+                         "RF_Type(%x) does not match RF_Num(%x)!!\n",
+                         rtlphy->rf_type, rf_num);
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("path1 0x%x, path2 0x%x, pathmap "
-                          "0x%x\n", path1, path2, pathmap));
+                         "path1 0x%x, path2 0x%x, pathmap 0x%x\n",
+                         path1, path2, pathmap);
         }
 
         return rtstatus;
@@ -1214,20 +1210,20 @@ void rtl92s_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
                         ROFDM0_XCAGCCORE1, MASKBYTE0);
         rtlphy->default_initialgain[3] = rtl_get_bbreg(hw,
                         ROFDM0_XDAGCCORE1, MASKBYTE0);
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("Default initial gain "
-                 "(c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
+                 "Default initial gain (c50=0x%x, c58=0x%x, c60=0x%x, c68=0x%x)\n",
                  rtlphy->default_initialgain[0],
                  rtlphy->default_initialgain[1],
                  rtlphy->default_initialgain[2],
-                 rtlphy->default_initialgain[3]));
+                 rtlphy->default_initialgain[3]);
 
         /* read framesync */
         rtlphy->framesync = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR3, MASKBYTE0);
         rtlphy->framesync_c34 = rtl_get_bbreg(hw, ROFDM0_RXDETECTOR2,
                                               MASKDWORD);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
-                 ("Default framesync (0x%x) = 0x%x\n",
-                 ROFDM0_RXDETECTOR3, rtlphy->framesync));
+                 "Default framesync (0x%x) = 0x%x\n",
+                 ROFDM0_RXDETECTOR3, rtlphy->framesync);
 
 }
 
@@ -1287,10 +1283,9 @@ void rtl92s_phy_set_txpower(struct ieee80211_hw *hw, u8	channel)
                         &ofdmpowerLevel[0]);
 
         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                        ("Channel-%d, cckPowerLevel (A / B) = "
-                        "0x%x / 0x%x,   ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
-                        channel, cckpowerlevel[0], cckpowerlevel[1],
-                        ofdmpowerLevel[0], ofdmpowerLevel[1]));
+                 "Channel-%d, cckPowerLevel (A / B) = 0x%x / 0x%x, ofdmPowerLevel (A / B) = 0x%x / 0x%x\n",
+                 channel, cckpowerlevel[0], cckpowerlevel[1],
+                 ofdmpowerLevel[0], ofdmpowerLevel[1]);
 
         _rtl92s_phy_ccxpower_indexcheck(hw, channel, &cckpowerlevel[0],
                         &ofdmpowerLevel[0]);
@@ -1316,7 +1311,7 @@ void rtl92s_phy_chk_fwcmd_iodone(struct ieee80211_hw *hw)
         } while (--pollingcnt);
 
         if (pollingcnt == 0)
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("Set FW Cmd fail!!\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Set FW Cmd fail!!\n");
 }
 
 
@@ -1345,20 +1340,17 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
 
         switch (rtlhal->current_fwcmd_io) {
         case FW_CMD_RA_RESET:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_RESET\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_RESET\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_RESET);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_ACTIVE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_ACTIVE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_ACTIVE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_ACTIVE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_REFRESH_N:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_N\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_RA_REFRESH_N\n");
                 input = FW_RA_REFRESH;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
@@ -1367,7 +1359,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         case FW_CMD_RA_REFRESH_BG:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_BG\n"));
+                         "FW_CMD_RA_REFRESH_BG\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_REFRESH);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 rtl_write_dword(rtlpriv, WFM5, FW_RA_DISABLE_RSSI_MASK);
@@ -1375,21 +1367,20 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 break;
         case FW_CMD_RA_REFRESH_N_COMB:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_N_COMB\n"));
+                         "FW_CMD_RA_REFRESH_N_COMB\n");
                 input = FW_RA_IOT_N_COMB;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_RA_REFRESH_BG_COMB:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_RA_REFRESH_BG_COMB\n"));
+                         "FW_CMD_RA_REFRESH_BG_COMB\n");
                 input = FW_RA_IOT_BG_COMB;
                 rtl_write_dword(rtlpriv, WFM5, input);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_IQK_ENABLE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_IQK_ENABLE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_IQK_ENABLE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_IQK_ENABLE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
@@ -1424,8 +1415,7 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                 rtl_set_bbreg(hw, RCCK0_CCA, MASKBYTE2, 0xcd);
                 break;
         case FW_CMD_LPS_ENTER:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_LPS_ENTER\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_ENTER\n");
                 current_aid = rtlpriv->mac80211.assoc_id;
                 rtl_write_dword(rtlpriv, WFM5, (FW_LPS_ENTER |
                                 ((current_aid | 0xc000) << 8)));
@@ -1434,20 +1424,18 @@ static void _rtl92s_phy_set_fwcmd_io(struct ieee80211_hw *hw)
                  * turbo mode until driver leave LPS */
                 break;
         case FW_CMD_LPS_LEAVE:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_LPS_LEAVE\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_LPS_LEAVE\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_LPS_LEAVE);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_ADD_A2_ENTRY:
-                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG,
-                         ("FW_CMD_ADD_A2_ENTRY\n"));
+                RT_TRACE(rtlpriv, COMP_CMD, DBG_DMESG, "FW_CMD_ADD_A2_ENTRY\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_ADD_A2_ENTRY);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
         case FW_CMD_CTRL_DM_BY_DRIVER:
                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                         ("FW_CMD_CTRL_DM_BY_DRIVER\n"));
+                         "FW_CMD_CTRL_DM_BY_DRIVER\n");
                 rtl_write_dword(rtlpriv, WFM5, FW_CTRL_DM_BY_DRIVER);
                 rtl92s_phy_chk_fwcmd_iodone(hw);
                 break;
@@ -1472,8 +1460,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
         bool bPostProcessing = false;
 
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                        ("Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
-                        fw_cmdio, rtlhal->set_fwcmd_inprogress));
+                 "Set FW Cmd(%#x), set_fwcmd_inprogress(%d)\n",
+                 fw_cmdio, rtlhal->set_fwcmd_inprogress);
 
         do {
                 /* We re-map to combined FW CMD ones if firmware version */
@@ -1501,7 +1489,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                  * DM map table in the future. */
                 switch (fw_cmdio) {
                 case FW_CMD_RA_INIT:
-                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, ("RA init!!\n"));
+                        RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "RA init!!\n");
                         fw_cmdmap |= FW_RA_INIT_CTL;
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         /* Clear control flag to sync with FW. */
@@ -1509,7 +1497,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         break;
                 case FW_CMD_DIG_DISABLE:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set DIG disable!!\n"));
+                                 "Set DIG disable!!\n");
                         fw_cmdmap &= ~FW_DIG_ENABLE_CTL;
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         break;
@@ -1517,14 +1505,14 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                 case FW_CMD_DIG_RESUME:
                         if (!(rtlpriv->dm.dm_flag & HAL_DM_DIG_DISABLE)) {
                                 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                        ("Set DIG enable or resume!!\n"));
+                                         "Set DIG enable or resume!!\n");
                                 fw_cmdmap |= (FW_DIG_ENABLE_CTL | FW_SS_CTL);
                                 FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         }
                         break;
                 case FW_CMD_DIG_HALT:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set DIG halt!!\n"));
+                                 "Set DIG halt!!\n");
                         fw_cmdmap &= ~(FW_DIG_ENABLE_CTL | FW_SS_CTL);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
                         break;
@@ -1540,9 +1528,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                                      (rtlefuse->thermalmeter[0] << 16));
 
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("Set TxPwr tracking!! "
-                                 "FwCmdMap(%#x), FwParam(%#x)\n",
-                                 fw_cmdmap, fw_param));
+                                 "Set TxPwr tracking!! FwCmdMap(%#x), FwParam(%#x)\n",
+                                 fw_cmdmap, fw_param);
 
                         FW_CMD_PARA_SET(rtlpriv, fw_param);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1563,9 +1550,8 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         fw_param &= FW_RA_PARAM_CLR;
 
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("[FW CMD] [New Version] "
-                                 "Set RA/IOT Comb in n mode!! FwCmdMap(%#x), "
-                                 "FwParam(%#x)\n", fw_cmdmap, fw_param));
+                                 "[FW CMD] [New Version] Set RA/IOT Comb in n mode!! FwCmdMap(%#x), FwParam(%#x)\n",
+                                 fw_cmdmap, fw_param);
 
                         FW_CMD_PARA_SET(rtlpriv, fw_param);
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
@@ -1652,7 +1638,7 @@ bool rtl92s_phy_set_fw_cmd(struct ieee80211_hw *hw, enum fwcmd_iotype fw_cmdio)
                         break;
                 case FW_CMD_PAPE_CONTROL:
                         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
-                                 ("[FW CMD] Set PAPE Control\n"));
+                                 "[FW CMD] Set PAPE Control\n");
                         fw_cmdmap &= ~FW_PAPE_CTL_BY_SW_HW;
 
                         FW_CMD_IO_SET(rtlpriv, fw_cmdmap);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
index 37e504af6446..ac0387770630 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index 11f125c030ce..84d1181795b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c b/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
index 0ad50fe44aa2..ad51906124db 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.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 "../wifi.h"
 #include "reg.h"
 #include "def.h"
@@ -123,13 +121,13 @@ static void _rtl92s_get_powerbase(struct ieee80211_hw *hw, u8 *p_pwrlevel,
         }
 
         if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("40MHz finalpwr_idx "
-                        "(A / B) = 0x%x / 0x%x\n", p_final_pwridx[0],
-                        p_final_pwridx[1]));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "40MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                         p_final_pwridx[0], p_final_pwridx[1]);
         } else {
-                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, ("20MHz finalpwr_idx "
-                        "(A / B) = 0x%x / 0x%x\n", p_final_pwridx[0],
-                         p_final_pwridx[1]));
+                RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
+                         "20MHz finalpwr_idx (A / B) = 0x%x / 0x%x\n",
+                         p_final_pwridx[0], p_final_pwridx[1]);
         }
 }
 
@@ -153,9 +151,8 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
                         ant_pwr_diff = -8;
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Antenna Diff from RF-B "
-                        "to RF-A = %d (0x%x)\n", ant_pwr_diff,
-                         ant_pwr_diff & 0xf));
+                         "Antenna Diff from RF-B to RF-A = %d (0x%x)\n",
+                         ant_pwr_diff, ant_pwr_diff & 0xf);
 
                 ant_pwr_diff &= 0xf;
         }
@@ -172,9 +169,8 @@ static void _rtl92s_set_antennadiff(struct ieee80211_hw *hw,
         rtl_set_bbreg(hw, RFPGA0_TXGAINSTAGE, (BXBTXAGC | BXCTXAGC | BXDTXAGC),
                       u4reg_val);
 
-        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                 ("Write BCD-Diff(0x%x) = 0x%x\n",
-                 RFPGA0_TXGAINSTAGE, u4reg_val));
+        RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, "Write BCD-Diff(0x%x) = 0x%x\n",
+                 RFPGA0_TXGAINSTAGE, u4reg_val);
 }
 
 static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
@@ -201,8 +197,7 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                 ((index < 2) ? pwrbase0 : pwrbase1);
 
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("RTK better performance, "
-                         "writeval = 0x%x\n", writeval));
+                         "RTK better performance, writeval = 0x%x\n", writeval);
                 break;
         case 1:
                 /* Realtek regulatory increase power diff defined
@@ -211,8 +206,8 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                         writeval = ((index < 2) ? pwrbase0 : pwrbase1);
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Realtek regulatory, "
-                                 "40MHz, writeval = 0x%x\n", writeval));
+                                 "Realtek regulatory, 40MHz, writeval = 0x%x\n",
+                                 writeval);
                 } else {
                         if (rtlphy->pwrgroup_cnt == 1)
                                 chnlgroup = 0;
@@ -234,16 +229,15 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                         pwrbase0 : pwrbase1);
 
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                 ("Realtek regulatory, "
-                                 "20MHz, writeval = 0x%x\n", writeval));
+                                 "Realtek regulatory, 20MHz, writeval = 0x%x\n",
+                                 writeval);
                 }
                 break;
         case 2:
                 /* Better regulatory don't increase any power diff */
                 writeval = ((index < 2) ? pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Better regulatory, "
-                         "writeval = 0x%x\n", writeval));
+                         "Better regulatory, writeval = 0x%x\n", writeval);
                 break;
         case 3:
                 /* Customer defined power diff. increase power diff
@@ -252,14 +246,14 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
 
                 if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                ("customer's limit, 40MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht40
-                                [RF90_PATH_A][chnl - 1]));
+                                 "customer's limit, 40MHz = 0x%x\n",
+                                 rtlefuse->pwrgroup_ht40
+                                 [RF90_PATH_A][chnl - 1]);
                 } else {
                         RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                                ("customer's limit, 20MHz = 0x%x\n",
-                                rtlefuse->pwrgroup_ht20
-                                [RF90_PATH_A][chnl - 1]));
+                                 "customer's limit, 20MHz = 0x%x\n",
+                                 rtlefuse->pwrgroup_ht20
+                                 [RF90_PATH_A][chnl - 1]);
                 }
 
                 for (i = 0; i < 4; i++) {
@@ -293,22 +287,19 @@ static void _rtl92s_get_txpower_writeval_byregulatory(struct ieee80211_hw *hw,
                                 (pwrdiff_limit[1] << 8) |
                                 (pwrdiff_limit[0]);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Customer's limit = 0x%x\n",
-                         customer_limit));
+                         "Customer's limit = 0x%x\n", customer_limit);
 
                 writeval = customer_limit + ((index < 2) ?
                                              pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("Customer, writeval = "
-                         "0x%x\n", writeval));
+                         "Customer, writeval = 0x%x\n", writeval);
                 break;
         default:
                 chnlgroup = 0;
                 writeval = rtlphy->mcs_txpwrlevel_origoffset[chnlgroup][index] +
                                 ((index < 2) ? pwrbase0 : pwrbase1);
                 RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,
-                         ("RTK better performance, "
-                         "writeval = 0x%x\n", writeval));
+                         "RTK better performance, writeval = 0x%x\n", writeval);
                 break;
         }
 
@@ -541,8 +532,7 @@ void rtl92s_phy_rf6052_set_bandwidth(struct ieee80211_hw *hw, u8 bandwidth)
                 break;
         default:
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("unknown bandwidth: %#X\n",
-                         bandwidth));
+                         "unknown bandwidth: %#X\n", bandwidth);
                 break;
         }
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/rf.h b/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
index 3843baa1a874..8a29eb94ab17 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/rf.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 36140ccf2abd..eda30b9d0f15 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.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,14 +27,11 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
+#include "../base.h"
+#include "../pci.h"
 #include "reg.h"
 #include "def.h"
 #include "phy.h"
@@ -45,6 +42,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -89,12 +88,53 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw)
         rtlpci->const_support_pciaspm = 2;
 }
 
+static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
+{
+        struct ieee80211_hw *hw = context;
+        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
+        struct rtl_priv *rtlpriv = rtl_priv(hw);
+        struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
+        struct rt_firmware *pfirmware = NULL;
+        int err;
+
+        RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
+                         "Firmware callback routine entered!\n");
+        complete(&rtlpriv->firmware_loading_complete);
+        if (!firmware) {
+                pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
+                rtlpriv->max_fw_size = 0;
+                return;
+        }
+        if (firmware->size > rtlpriv->max_fw_size) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Firmware is too big!\n");
+                release_firmware(firmware);
+                return;
+        }
+        pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;
+        memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
+        pfirmware->sz_fw_tmpbufferlen = firmware->size;
+        release_firmware(firmware);
+
+        err = ieee80211_register_hw(hw);
+        if (err) {
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                         "Can't register mac80211 hw\n");
+                return;
+        } else {
+                rtlpriv->mac80211.mac80211_registered = 1;
+        }
+        rtlpci->irq_alloc = 1;
+        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
+
+        /*init rfkill */
+        rtl_init_rfkill(hw);
+}
+
 static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
-        struct rt_firmware *pfirmware = NULL;
         int err = 0;
         u16 earlyrxthreshold = 7;
 
@@ -168,9 +208,9 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
         if (!rtlpriv->psc.inactiveps)
-                pr_info("rtl8192ce: Power Save off (module option)\n");
+                pr_info("Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
-                pr_info("rtl8192ce: FW Power Save off (module option)\n");
+                pr_info("FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -189,27 +229,19 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
         if (!rtlpriv->rtlhal.pfirmware)
                 return 1;
 
+        rtlpriv->max_fw_size = sizeof(struct rt_firmware);
+
         pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
                 "Loading firmware %s\n", rtlpriv->cfg->fw_name);
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl92se_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        if (firmware->size > sizeof(struct rt_firmware)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
-                return 1;
-        }
-
-        pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware;
-        memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
-        pfirmware->sz_fw_tmpbufferlen = firmware->size;
-        release_firmware(firmware);
 
         return err;
 }
@@ -423,7 +455,7 @@ static int __init rtl92se_module_init(void)
 
         ret = pci_register_driver(&rtl92se_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
 
         return ret;
 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.h b/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
index fc4eb285a0ac..2eb88862ebe4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/table.c b/drivers/net/wireless/rtlwifi/rtl8192se/table.c
index 154185b3969d..f1a73f75127e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/table.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/table.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
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/table.h b/drivers/net/wireless/rtlwifi/rtl8192se/table.h
index b4ed6d951ebb..2feb73b71a4f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/table.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/table.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
+ * Copyright(c) 2008 - 2012 Realtek Corporation. All rights reserved.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index fbebe3ea0a22..2fd3d13b7ced 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.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
@@ -756,7 +756,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
         /* DOWRD 8 */
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, cpu_to_le32(mapping));
 
-        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, ("\n"));
+        RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
 }
 
 void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
@@ -823,8 +823,8 @@ void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -843,8 +843,8 @@ void rtl92se_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)
                         SET_RX_STATUS_DESC_EOR(pdesc, 1);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
@@ -863,8 +863,8 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)
                         ret = GET_TX_DESC_TX_BUFFER_ADDRESS(desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR txdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR txdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         } else {
@@ -876,8 +876,8 @@ u32 rtl92se_get_desc(u8 *desc, bool istx, u8 desc_name)
                         ret = GET_RX_STATUS_DESC_PKT_LEN(desc);
                         break;
                 default:
-                        RT_ASSERT(false, ("ERR rxdesc :%d not process\n",
-                                  desc_name));
+                        RT_ASSERT(false, "ERR rxdesc :%d not process\n",
+                                  desc_name);
                         break;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
index 05862c51b861..011e7b0695f2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.h
@@ -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
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index e956fa71d040..ffcf89fe45e4 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2011  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
@@ -25,16 +25,13 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/usb.h>
-#include <linux/export.h>
-#include "core.h"
 #include "wifi.h"
+#include "core.h"
 #include "usb.h"
 #include "base.h"
 #include "ps.h"
 #include "rtl8192c/fw_common.h"
+#include <linux/export.h>
 
 #define REALTEK_USB_VENQT_READ                  0xC0
 #define REALTEK_USB_VENQT_WRITE                 0x40
@@ -276,14 +273,14 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw)
                                                     ? USB_HIGH_SPEED_BULK_SIZE
                                                     : USB_FULL_SPEED_BULK_SIZE;
 
-        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("USB Max Bulk-out Size=%d\n",
-                 rtlusb->max_bulk_out_size));
+        RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "USB Max Bulk-out Size=%d\n",
+                 rtlusb->max_bulk_out_size);
 
         for (i = 0; i < __RTL_TXQ_NUM; i++) {
                 u32 ep_num = rtlusb->ep_map.ep_mapping[i];
                 if (!ep_num) {
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                                 ("Invalid endpoint map setting!\n"));
+                                 "Invalid endpoint map setting!\n");
                         return -EINVAL;
                 }
         }
@@ -345,9 +342,9 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)
                         rtlusb->out_ep_nums++;
 
                 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-                         ("USB EP(0x%02x), MaxPacketSize=%d ,Interval=%d.\n",
+                         "USB EP(0x%02x), MaxPacketSize=%d, Interval=%d\n",
                          pep_desc->bEndpointAddress, pep_desc->wMaxPacketSize,
-                         pep_desc->bInterval));
+                         pep_desc->bInterval);
         }
         if (rtlusb->in_ep_nums <  rtlpriv->cfg->usb_interface_cfg->in_ep_num)
                 return -EINVAL ;
@@ -414,7 +411,7 @@ static struct sk_buff *_rtl_prep_rx_urb(struct ieee80211_hw *hw,
                                gfp_mask);
         if (!skb) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Failed to __dev_alloc_skb!!\n"))
+                         "Failed to __dev_alloc_skb!!\n");
                 return ERR_PTR(-ENOMEM);
         }
 
@@ -520,12 +517,14 @@ static void _rtl_usb_rx_process_noagg(struct ieee80211_hw *hw,
                         u8 *pdata;
 
                         uskb = dev_alloc_skb(skb->len + 128);
-                        memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
-                               sizeof(rx_status));
-                        pdata = (u8 *)skb_put(uskb, skb->len);
-                        memcpy(pdata, skb->data, skb->len);
+                        if (uskb) {     /* drop packet on allocation failure */
+                                memcpy(IEEE80211_SKB_RXCB(uskb), &rx_status,
+                                       sizeof(rx_status));
+                                pdata = (u8 *)skb_put(uskb, skb->len);
+                                memcpy(pdata, skb->data, skb->len);
+                                ieee80211_rx_irqsafe(hw, uskb);
+                        }
                         dev_kfree_skb_any(skb);
-                        ieee80211_rx_irqsafe(hw, uskb);
                 } else {
                         dev_kfree_skb_any(skb);
                 }
@@ -575,7 +574,7 @@ static void _rtl_rx_completed(struct urb *_urb)
                         if (IS_ERR(_skb)) {
                                 err = PTR_ERR(_skb);
                                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                        ("Can't allocate skb for bulk IN!\n"));
+                                         "Can't allocate skb for bulk IN!\n");
                                 return;
                         }
                         skb = _skb;
@@ -632,14 +631,14 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
                         RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                 ("Failed to alloc URB!!\n"))
+                                 "Failed to alloc URB!!\n");
                         goto err_out;
                 }
 
                 skb = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);
                 if (IS_ERR(skb)) {
                         RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                                 ("Failed to prep_rx_urb!!\n"))
+                                 "Failed to prep_rx_urb!!\n");
                         err = PTR_ERR(skb);
                         goto err_out;
                 }
@@ -665,15 +664,17 @@ static int rtl_usb_start(struct ieee80211_hw *hw)
         struct rtl_usb *rtlusb = rtl_usbdev(rtl_usbpriv(hw));
 
         err = rtlpriv->cfg->ops->hw_init(hw);
-        rtl_init_rx_config(hw);
+        if (!err) {
+                rtl_init_rx_config(hw);
 
-        /* Enable software */
-        SET_USB_START(rtlusb);
-        /* should after adapter start and interrupt enable. */
-        set_hal_start(rtlhal);
+                /* Enable software */
+                SET_USB_START(rtlusb);
+                /* should after adapter start and interrupt enable. */
+                set_hal_start(rtlhal);
 
-        /* Start bulk IN */
-        _rtl_usb_receive(hw);
+                /* Start bulk IN */
+                _rtl_usb_receive(hw);
+        }
 
         return err;
 }
@@ -745,7 +746,7 @@ static void _rtl_submit_tx_urb(struct ieee80211_hw *hw, struct urb *_urb)
                 struct sk_buff *skb;
 
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Failed to submit urb.\n"));
+                         "Failed to submit urb\n");
                 usb_unanchor_urb(_urb);
                 skb = (struct sk_buff *)_urb->context;
                 kfree_skb(skb);
@@ -768,7 +769,7 @@ static int _usb_tx_post(struct ieee80211_hw *hw, struct urb *urb,
 
         if (urb->status) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Urb has error status 0x%X\n", urb->status));
+                         "Urb has error status 0x%X\n", urb->status);
                 goto out;
         }
         /*  TODO:       statistics */
@@ -805,7 +806,7 @@ static struct urb *_rtl_usb_tx_urb_setup(struct ieee80211_hw *hw,
         _urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!_urb) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("Can't allocate URB for bulk out!\n"));
+                         "Can't allocate URB for bulk out!\n");
                 kfree_skb(skb);
                 return NULL;
         }
@@ -830,7 +831,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
         WARN_ON(NULL == rtlusb->usb_tx_aggregate_hdl);
         if (unlikely(IS_USB_STOP(rtlusb))) {
                 RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,
-                         ("USB device is stopping...\n"));
+                         "USB device is stopping...\n");
                 kfree_skb(skb);
                 return;
         }
@@ -840,7 +841,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb,
         _urb = _rtl_usb_tx_urb_setup(hw, _skb, ep_num);
         if (unlikely(!_urb)) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate urb. Drop skb!\n"));
+                         "Can't allocate urb. Drop skb!\n");
                 return;
         }
         urb_list = &rtlusb->tx_pending[ep_num];
@@ -865,7 +866,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw, struct sk_buff *skb,
 
         memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
         if (ieee80211_is_auth(fc)) {
-                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
+                RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");
                 rtl_ips_nic_on(hw);
         }
 
@@ -946,10 +947,11 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         hw = ieee80211_alloc_hw(sizeof(struct rtl_priv) +
                                 sizeof(struct rtl_usb_priv), &rtl_ops);
         if (!hw) {
-                RT_ASSERT(false, ("%s : ieee80211 alloc failed\n", __func__));
+                RT_ASSERT(false, "ieee80211 alloc failed\n");
                 return -ENOMEM;
         }
         rtlpriv = hw->priv;
+        init_completion(&rtlpriv->firmware_loading_complete);
         SET_IEEE80211_DEV(hw, &intf->dev);
         udev = interface_to_usbdev(intf);
         usb_get_dev(udev);
@@ -969,8 +971,7 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         /*like read eeprom and so on */
         rtlpriv->cfg->ops->read_eeprom_info(hw);
         if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't init_sw_vars.\n"));
+                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
                 goto error_out;
         }
         rtlpriv->cfg->ops->init_sw_leds(hw);
@@ -980,28 +981,16 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
         err = rtl_init_core(hw);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't allocate sw for mac80211.\n"));
+                         "Can't allocate sw for mac80211\n");
                 goto error_out;
         }
 
-        /*init rfkill */
-        /* rtl_init_rfkill(hw); */
-
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG,
-                         ("Can't register mac80211 hw.\n"));
-                goto error_out;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 error_out:
         rtl_deinit_core(hw);
         _rtl_usb_io_handler_release(hw);
-        ieee80211_free_hw(hw);
         usb_put_dev(udev);
+        complete(&rtlpriv->firmware_loading_complete);
         return -ENODEV;
 }
 EXPORT_SYMBOL(rtl_usb_probe);
@@ -1015,6 +1004,9 @@ void rtl_usb_disconnect(struct usb_interface *intf)
 
         if (unlikely(!rtlpriv))
                 return;
+
+        /* just in case driver is removed before firmware callback */
+        wait_for_completion(&rtlpriv->firmware_loading_complete);
         /*ieee80211_unregister_hw will call ops_stop */
         if (rtlmac->mac80211_registered == 1) {
                 ieee80211_unregister_hw(hw);
diff --git a/drivers/net/wireless/rtlwifi/usb.h b/drivers/net/wireless/rtlwifi/usb.h
index d2a63fb3e1e6..43846b329153 100644
--- a/drivers/net/wireless/rtlwifi/usb.h
+++ b/drivers/net/wireless/rtlwifi/usb.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2011  Realtek Corporation. All rights reserved.
+ * Copyright(c) 2009-2012  Realtek Corporation. All rights reserved.
  *
  * 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
@@ -28,7 +28,6 @@
 #ifndef __RTL_USB_H__
 #define __RTL_USB_H__
 
-#include <linux/usb.h>
 #include <linux/skbuff.h>
 
 #define RTL_RX_DESC_SIZE                24
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index cdaf1429fa0b..b591614c3b9b 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -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
@@ -30,12 +30,15 @@
 #ifndef __RTL_WIFI_H__
 #define __RTL_WIFI_H__
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/sched.h>
 #include <linux/firmware.h>
 #include <linux/etherdevice.h>
 #include <linux/vmalloc.h>
 #include <linux/usb.h>
 #include <net/mac80211.h>
+#include <linux/completion.h>
 #include "debug.h"
 
 #define RF_CHANGE_BY_INIT                       0
@@ -1045,7 +1048,6 @@ struct rtl_hal {
         u16 fw_subversion;
         bool h2c_setinprogress;
         u8 last_hmeboxnum;
-        bool fw_ready;
         /*Reserve page start offset except beacon in TxQ. */
         u8 fw_rsvdpage_startoffset;
         u8 h2c_txcmd_seq;
@@ -1591,6 +1593,7 @@ struct rtl_debug {
 };
 
 struct rtl_priv {
+        struct completion firmware_loading_complete;
         struct rtl_locks locks;
         struct rtl_works works;
         struct rtl_mac mac80211;
@@ -1612,6 +1615,7 @@ struct rtl_priv {
         struct rtl_rate_priv *rate_priv;
 
         struct rtl_debug dbg;
+        int max_fw_size;
 
         /*
          *hal_cfg : for diff cards
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index ba3268ea81fe..41302c7b1ad0 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -514,6 +514,9 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw,
         struct wl1251 *wl = hw->priv;
         int ret = 0;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
+                             IEEE80211_VIF_SUPPORTS_CQM_RSSI;
+
         wl1251_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
                      vif->type, vif->addr);
 
@@ -1338,9 +1341,7 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
 
         wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
                 IEEE80211_HW_SUPPORTS_PS |
-                IEEE80211_HW_BEACON_FILTER |
-                IEEE80211_HW_SUPPORTS_UAPSD |
-                IEEE80211_HW_SUPPORTS_CQM_RSSI;
+                IEEE80211_HW_SUPPORTS_UAPSD;
 
         wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
                                          BIT(NL80211_IFTYPE_ADHOC);
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index d5f55a149de5..f8748cedbae1 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2060,6 +2060,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
         u8 role_type;
         bool booted = false;
 
+        vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
+                             IEEE80211_VIF_SUPPORTS_CQM_RSSI;
+
         wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
                      ieee80211_vif_type_p2p(vif), vif->addr);
 
@@ -4898,12 +4901,10 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
         wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval;
 
         wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
-                IEEE80211_HW_BEACON_FILTER |
                 IEEE80211_HW_SUPPORTS_PS |
                 IEEE80211_HW_SUPPORTS_UAPSD |
                 IEEE80211_HW_HAS_RATE_CONTROL |
                 IEEE80211_HW_CONNECTION_MONITOR |
-                IEEE80211_HW_SUPPORTS_CQM_RSSI |
                 IEEE80211_HW_REPORTS_TX_ACK_STATUS |
                 IEEE80211_HW_SPECTRUM_MGMT |
                 IEEE80211_HW_AP_LINK_PS |