Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 884dd244 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

rtlwifi: Neaten RT_ASSERT, RT_TRACE, RTPRINT, RT_PRINT_DATA macros 



Make the macros a bit more readable.

Use do {...} while (0) without terminating semicolons.
Add missing terminating semicolon to a few uses.

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 3084f3b6

drivers/net/wireless/rtlwifi/debug.h

+41 −47
Original line number Original line Diff line number Diff line
@@ -159,21 +159,22 @@ enum dbgp_flag_e { 
#define RT_ASSERT(_exp, fmt)						\

#define RT_ASSERT(_exp, fmt)						\

do {									\

do {									\

	if (!(_exp)) {							\

	if (!(_exp)) {							\

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

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

			__func__);			\

		       KBUILD_MODNAME, __func__);			\

		printk fmt;						\

		printk fmt;						\

	}								\

	}								\

	} while (0);

} while (0)





#define RT_TRACE(rtlpriv, comp, level, fmt)				\

#define RT_TRACE(rtlpriv, comp, level, fmt)				\

do {									\

do {									\

	if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) &&	\

	if (unlikely(((comp) & rtlpriv->dbg.global_debugcomponents) &&	\

		     ((level) <= rtlpriv->dbg.global_debuglevel))) {	\

		     ((level) <= rtlpriv->dbg.global_debuglevel))) {	\

			printk(KERN_DEBUG "%s:%s():<%lx-%x> ", KBUILD_MODNAME, \

		printk(KERN_DEBUG "%s:%s():<%lx-%x> ",			\

			__func__, in_interrupt(), in_atomic());	\

		       KBUILD_MODNAME, __func__,			\

		       in_interrupt(), in_atomic());			\

		printk fmt;						\

		printk fmt;						\

	}								\

	}								\

	} while (0);

} while (0)





#define RTPRINT(rtlpriv, dbgtype, dbgflag, printstr)			\

#define RTPRINT(rtlpriv, dbgtype, dbgflag, printstr)			\

do {									\

do {									\
@@ -181,28 +182,21 @@ enum dbgp_flag_e { 
		printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);		\

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

		printk printstr;					\

		printk printstr;					\

	}								\

	}								\

	} while (0);

} while (0)





#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,	\

#define RT_PRINT_DATA(rtlpriv, _comp, _level, _titlestring, _hexdata,	\

		      _hexdatalen)					\

		      _hexdatalen)					\

do {									\

do {									\

	if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&	\

	if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&	\

		     (_level <= rtlpriv->dbg.global_debuglevel))) {	\

		     (_level <= rtlpriv->dbg.global_debuglevel))) {	\

			int __i;					\

			u8*	ptr = (u8 *)_hexdata;			\

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

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

			printk("In process \"%s\" (pid %i):", current->comm,\

		pr_cont("In process \"%s\" (pid %i):",			\

					current->pid); \

			current->comm, current->pid);			\

		printk(_titlestring);					\

		printk(_titlestring);					\

			for (__i = 0; __i < (int)_hexdatalen; __i++) {	\

		print_hex_dump_bytes("", DUMP_PREFIX_NONE,		\

				printk("%02X%s", ptr[__i], (((__i + 1) % 4)\

				     _hexdata, _hexdatalen);		\

							== 0) ? "  " : " ");\

				if (((__i + 1) % 16) == 0)		\

					printk("\n");			\

	}								\

	}								\

			printk(KERN_DEBUG "\n");			\

} while (0)

		} \

	} while (0);





void rtl_dbgp_flag_init(struct ieee80211_hw *hw);

void rtl_dbgp_flag_init(struct ieee80211_hw *hw);

#endif
 
#endif

drivers/net/wireless/rtlwifi/rtl8192ce/phy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,

	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,

		 ("Switch to %s bandwidth\n",

		 ("Switch to %s bandwidth\n",

		  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?

		  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?

		  "20MHz" : "40MHz"))

		  "20MHz" : "40MHz"));





	if (is_hal_stop(rtlhal)) {

	if (is_hal_stop(rtlhal)) {

		rtlphy->set_bwmode_inprogress = false;

		rtlphy->set_bwmode_inprogress = false;

drivers/net/wireless/rtlwifi/rtl8192cu/phy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ void rtl92cu_phy_set_bw_mode_callback(struct ieee80211_hw *hw) 
	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,

	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE,

		 ("Switch to %s bandwidth\n",

		 ("Switch to %s bandwidth\n",

		  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?

		  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ?

		  "20MHz" : "40MHz"))

		  "20MHz" : "40MHz"));

	if (is_hal_stop(rtlhal)) {

	if (is_hal_stop(rtlhal)) {

		rtlphy->set_bwmode_inprogress = false;

		rtlphy->set_bwmode_inprogress = false;

		return;

		return;

drivers/net/wireless/rtlwifi/rtl8192de/hw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1617,7 +1617,7 @@ static void _rtl92de_read_txpower_info(struct ieee80211_hw *hw, 
			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

			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[0],

				 rtlefuse->internal_pa_5g[1]))

				 rtlefuse->internal_pa_5g[1]));

		}

		}

		rtlefuse->eeprom_c9 = hwinfo[EEPROM_RF_OPT6];

		rtlefuse->eeprom_c9 = hwinfo[EEPROM_RF_OPT6];

		rtlefuse->eeprom_cc = hwinfo[EEPROM_RF_OPT7];

		rtlefuse->eeprom_cc = hwinfo[EEPROM_RF_OPT7];

drivers/net/wireless/rtlwifi/usb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -414,7 +414,7 @@ static struct sk_buff *_rtl_prep_rx_urb(struct ieee80211_hw *hw, 
			       gfp_mask);

			       gfp_mask);

	if (!skb) {

	if (!skb) {

		RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

		RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

			 ("Failed to __dev_alloc_skb!!\n"))

			 ("Failed to __dev_alloc_skb!!\n"));

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	}

	}
@@ -632,14 +632,14 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw) 
		urb = usb_alloc_urb(0, GFP_KERNEL);

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (!urb) {

		if (!urb) {

			RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

			RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

				 ("Failed to alloc URB!!\n"))

				 ("Failed to alloc URB!!\n"));

			goto err_out;

			goto err_out;

		}

		}





		skb = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);

		skb = _rtl_prep_rx_urb(hw, rtlusb, urb, GFP_KERNEL);

		if (IS_ERR(skb)) {

		if (IS_ERR(skb)) {

			RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

			RT_TRACE(rtlpriv, COMP_USB, DBG_EMERG,

				 ("Failed to prep_rx_urb!!\n"))

				 ("Failed to prep_rx_urb!!\n"));

			err = PTR_ERR(skb);

			err = PTR_ERR(skb);

			goto err_out;

			goto err_out;

		}

		}