Commit e4ff7d6b authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David S. Miller
Browse files

net: ipw2x00,iwlegacy,iwlwifi: Remove in_interrupt() from debug macros 



The usage of in_interrupt() in non-core code is phased out.

The debugging macros in these drivers use in_interrupt() to print 'I' or
'U' depending on the return value of in_interrupt(). While 'U' is confusing
at best and 'I' is not really describing the actual context (hard interupt,
soft interrupt, bottom half disabled section) these debug macros originate
from the pre ftrace kernel era and their value today is questionable. They
probably should be removed completely.

The macros weere added initially for ipw2100 and then spreaded when the
driver was forked.

Remove the in_interrupt() usage at least..

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c597ede4

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ static u32 ipw2100_debug_level = IPW_DL_NONE; 
#define IPW_DEBUG(level, message...) \

do { \

	if (ipw2100_debug_level & (level)) { \

		printk(KERN_DEBUG "ipw2100: %c %s ", \

                       in_interrupt() ? 'I' : 'U',  __func__); \

		printk(KERN_DEBUG "ipw2100: %s ", __func__); \

		printk(message); \

	} \

} while (0)

drivers/net/wireless/intel/ipw2x00/ipw2200.h

+2 −4
Original line number Diff line number Diff line
@@ -1382,14 +1382,12 @@ BIT_ARG16(x) 


#define IPW_DEBUG(level, fmt, args...) \

do { if (ipw_debug_level & (level)) \

  printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \

         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)

  printk(KERN_DEBUG DRV_NAME": %s " fmt, __func__ , ## args); } while (0)



#ifdef CONFIG_IPW2200_DEBUG

#define IPW_LL_DEBUG(level, fmt, args...) \

do { if (ipw_debug_level & (level)) \

  printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \

         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)

  printk(KERN_DEBUG DRV_NAME": %s " fmt, __func__ , ## args); } while (0)

#else

#define IPW_LL_DEBUG(level, fmt, args...) do {} while (0)

#endif				/* CONFIG_IPW2200_DEBUG */

drivers/net/wireless/intel/ipw2x00/libipw.h

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ 
extern u32 libipw_debug_level;

#define LIBIPW_DEBUG(level, fmt, args...) \

do { if (libipw_debug_level & (level)) \

  printk(KERN_DEBUG "libipw: %c %s " fmt, \

         in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)

  printk(KERN_DEBUG "libipw: %s " fmt, __func__ , ## args); } while (0)

#else

#define LIBIPW_DEBUG(level, fmt, args...) do {} while (0)

#endif				/* CONFIG_LIBIPW_DEBUG */

drivers/net/wireless/intel/iwlegacy/common.h

+2 −2
Original line number Diff line number Diff line
@@ -2925,8 +2925,8 @@ do { \ 
#define IL_DBG(level, fmt, args...)					\

do {									\

	if (il_get_debug_level(il) & level)				\

		dev_err(&il->hw->wiphy->dev, "%c %s " fmt,		\

			in_interrupt() ? 'I' : 'U', __func__ , ##args); \

		dev_err(&il->hw->wiphy->dev, "%s " fmt, __func__,	\

			 ##args);					\

} while (0)



#define il_print_hex_dump(il, level, p, len)				\

drivers/net/wireless/intel/iwlwifi/iwl-debug.c

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ void __iwl_dbg(struct device *dev, 
#ifdef CONFIG_IWLWIFI_DEBUG

	if (iwl_have_debug_level(level) &&

	    (!limit || net_ratelimit()))

		dev_printk(KERN_DEBUG, dev, "%c %s %pV",

			   in_interrupt() ? 'I' : 'U', function, &vaf);

		dev_printk(KERN_DEBUG, dev, "%s %pV", function, &vaf);

#endif

	trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);

	va_end(args);

CRA Git | Maintained and supported by SUSTech CRA and CCSE