rtlwifi: Convert RT_TRACE macro to use ##__VA_ARGS__

Consolidate printks to avoid possible message interleaving
and reduce the object size.

Remove unnecessary RT_TRACE parentheses.

Miscellaneous typo and grammar fixes.
Add missing newlines to formats.
Remove duplicate KERN_DEBUG prefixes.
Coalesce formats.
Align arguments.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text    data     bss     dec     hex filename
 594841   55333  129680  779854   be64e drivers/net/wireless/rtlwifi/built-in.o.new
 607022   55333  138720  801075   c3933 drivers/net/wireless/rtlwifi/built-in.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 90 insertions, 106 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 39e0907a3c4e..b52fef235754 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -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
@@ -709,9 +704,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 +790,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 +828,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 +836,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 +844,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 +852,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 +861,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 +1021,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 +1032,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 +1071,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 +1348,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 +1381,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 +1418,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 +1487,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 +1509,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 +1525,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;
 }
 
@@ -1622,20 +1612,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 +1636,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 +1655,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 +1682,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 +1712,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);
 
@@ -1828,10 +1815,9 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         }
 
         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 +1837,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,22 +1850,21 @@ 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"));
+                         "Can't register mac80211 hw\n");
                 goto fail3;
         } else {
                 rtlpriv->mac80211.mac80211_registered = 1;
@@ -1889,7 +1873,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         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;
         }
 
@@ -1901,8 +1885,8 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                           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;