rtlwifi: Convert RT_ASSERT macro to use ##__VA_ARGS__

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

Remove unnecessary RT_ASSERT parentheses.
Align arguments.
Coalesce formats.
Remove unnecessary __func__ use as the macro uses it.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 588901	  55333	 127216	 771450	  bc57a	drivers/net/wireless/rtlwifi/built-in.o.new
 590002	  55333	 127560	 772895	  bcb1f	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, 7 insertions, 8 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index b52fef235754..3c4ae5d9de4f 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1746,16 +1746,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;
                 }
@@ -1767,7 +1766,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;
         }
@@ -1797,7 +1796,7 @@ 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"));
+                RT_ASSERT(false, "Can't obtain PCI resources\n");
                 return err;
         }
 
@@ -1810,7 +1809,7 @@ 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;
         }