Commit d2bf5583 authored by Wu Fengguang's avatar Wu Fengguang Committed by John W. Linville
Browse files

iwlwifi: beautify code



This patch beautifies macros in iwl-debug.h.

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b5323d36
Loading
Loading
Loading
Loading
+85 −82
Original line number Diff line number Diff line
@@ -33,14 +33,18 @@ struct iwl_priv;

#ifdef CONFIG_IWLWIFI_DEBUG
#define IWL_DEBUG(level, fmt, args...)					    \
do { if (priv->debug_level & (level)) \
do {									    \
	if (priv->debug_level & (level))				    \
		dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), "%c %s " fmt, \
	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
			   in_interrupt() ? 'I' : 'U', __func__ , ## args); \
} while (0)

#define IWL_DEBUG_LIMIT(level, fmt, args...)				    \
do { if ((priv->debug_level & (level)) && net_ratelimit()) \
do {									    \
	if ((priv->debug_level & (level)) && net_ratelimit())		    \
		dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), "%c %s " fmt, \
	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
			   in_interrupt() ? 'I' : 'U', __func__ , ## args); \
} while (0)

#define iwl_print_hex_dump(priv, level, p, len) 			\
do {                                            			\
@@ -120,33 +124,32 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
 * when CONFIG_IWLWIFI_DEBUG=y.
 */

/* 0x0000000F - 0x00000001 */
#define IWL_DL_INFO		(1 << 0)
#define IWL_DL_MAC80211		(1 << 1)
#define IWL_DL_HCMD		(1 << 2)
#define IWL_DL_STATE		(1 << 3)
/* 0x000000F0 - 0x00000010 */
#define IWL_DL_MACDUMP		(1 << 4)
#define IWL_DL_HCMD_DUMP	(1 << 5)
#define IWL_DL_RADIO		(1 << 7)

#define IWL_DL_POWER		(1 << 8)
#define IWL_DL_TEMP		(1 << 9)

#define IWL_DL_NOTIF		(1 << 10)
#define IWL_DL_SCAN		(1 << 11)

#define IWL_DL_ASSOC		(1 << 12)
#define IWL_DL_DROP		(1 << 13)

#define IWL_DL_TXPOWER		(1 << 14)

#define IWL_DL_AP		(1 << 15)

#define IWL_DL_FW		(1 << 16)
#define IWL_DL_RF_KILL		(1 << 17)
#define IWL_DL_FW_ERRORS	(1 << 18)

#define IWL_DL_LED		(1 << 19)

#define IWL_DL_RATE		(1 << 20)

#define IWL_DL_CALIB		(1 << 21)
#define IWL_DL_WEP		(1 << 22)
#define IWL_DL_TX		(1 << 23)
@@ -155,17 +158,16 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
#define IWL_DL_HT		(1 << 26)
#define IWL_DL_IO		(1 << 27)
#define IWL_DL_11H		(1 << 28)

#define IWL_DL_STATS		(1 << 29)
#define IWL_DL_TX_REPLY		(1 << 30)
#define IWL_DL_QOS		(1 << 31)

#define IWL_ERROR(f, a...) dev_printk(KERN_ERR, \
			&(priv->hw->wiphy->dev), f, ## a)
#define IWL_WARNING(f, a...) dev_printk(KERN_WARNING, \
			&(priv->hw->wiphy->dev), f, ## a)
#define IWL_DEBUG_INFO(f, a...)    IWL_DEBUG(IWL_DL_INFO, f, ## a)
#define IWL_ERROR(f, a...)		\
		dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), f, ## a)
#define IWL_WARNING(f, a...)		\
		dev_printk(KERN_WARNING, &(priv->hw->wiphy->dev), f, ## a)

#define IWL_DEBUG_INFO(f, a...)		IWL_DEBUG(IWL_DL_INFO, f, ## a)
#define IWL_DEBUG_MAC80211(f, a...)	IWL_DEBUG(IWL_DL_MAC80211, f, ## a)
#define IWL_DEBUG_MACDUMP(f, a...)	IWL_DEBUG(IWL_DL_MACDUMP, f, ## a)
#define IWL_DEBUG_TEMP(f, a...)		IWL_DEBUG(IWL_DL_TEMP, f, ## a)
@@ -188,7 +190,8 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
#define IWL_DEBUG_RATE(f, a...)		IWL_DEBUG(IWL_DL_RATE, f, ## a)
#define IWL_DEBUG_RATE_LIMIT(f, a...)	IWL_DEBUG_LIMIT(IWL_DL_RATE, f, ## a)
#define IWL_DEBUG_NOTIF(f, a...)	IWL_DEBUG(IWL_DL_NOTIF, f, ## a)
#define IWL_DEBUG_ASSOC(f, a...) IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
#define IWL_DEBUG_ASSOC(f, a...)	\
		IWL_DEBUG(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
#define IWL_DEBUG_ASSOC_LIMIT(f, a...)	\
		IWL_DEBUG_LIMIT(IWL_DL_ASSOC | IWL_DL_INFO, f, ## a)
#define IWL_DEBUG_HT(f, a...)		IWL_DEBUG(IWL_DL_HT, f, ## a)