Commit 9d833ed7 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4c48869f

drivers/net/wireless/rtlwifi/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1026,8 +1026,8 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,

				 "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;

drivers/net/wireless/rtlwifi/debug.h

+3 −4
Original line number Diff line number Diff line
@@ -156,12 +156,11 @@ enum dbgp_flag_e { 
	DBGP_TYPE_MAX

};



#define RT_ASSERT(_exp, fmt)						\

#define RT_ASSERT(_exp, fmt, ...)					\

do {									\

	if (!(_exp)) {							\

		printk(KERN_DEBUG "%s:%s(): ",				\

		       KBUILD_MODNAME, __func__);			\

		printk fmt;						\

		printk(KERN_DEBUG KBUILD_MODNAME ":%s(): " fmt,		\

		       __func__, ##__VA_ARGS__);			\

	}								\

} while (0)

drivers/net/wireless/rtlwifi/pci.c

+7 −8
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c

+3 −3
Original line number Diff line number Diff line
@@ -519,8 +519,8 @@ void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw, 
	u32 tmp_cmdbuf[2];



	if (rtlhal->fw_ready == false) {

		RT_ASSERT(false, ("return H2C cmd because of Fw "

				  "download fail!!!\n"));

		RT_ASSERT(false,

			  "return H2C cmd because of Fw download fail!!!\n");

		return;

	}
@@ -544,7 +544,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);

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c

+5 −5
Original line number Diff line number Diff line
@@ -85,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;



}
@@ -95,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);
@@ -776,7 +776,7 @@ 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;
@@ -802,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;

	}
@@ -848,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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE