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

Commit 1e7aecc2 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

iwl-debug: Shrink object by using dev_err and deduplicating formats 



Using dev_err instead of dev_printk(KERN_ERR uses fewer
arguments and is a bit smaller.

Deduplicating formats used by IWL_DEBUG_QUIET_RFKILL also
makes the object a bit smaller.

Neatened the macros, used ##__VA_ARGS__.

$ size drivers/net/wireless/iwlwifi/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 462652	   8646	  92576	 563874	  89aa2	drivers/net/wireless/iwlwifi/built-in.o.new
 467557	   8646	  92592	 568795	  8addb	drivers/net/wireless/iwlwifi/built-in.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1ffeb2a3

drivers/net/wireless/iwlwifi/iwl-debug.h

+21 −16
Original line number Diff line number Diff line
@@ -47,20 +47,21 @@ do { \ 
} while (0)



#ifdef CONFIG_IWLWIFI_DEBUG

#define IWL_DEBUG(m, level, fmt, args...)				\

#define IWL_DEBUG(m, level, fmt, ...)					\

do {									\

	if (iwl_get_debug_level((m)->shrd) & (level))			\

		dev_printk(KERN_ERR, bus(m)->dev,			\

			 "%c %s " fmt, in_interrupt() ? 'I' : 'U',	\

			__func__ , ## args);				\

		dev_err(bus(m)->dev, "%c %s " fmt,			\

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

			##__VA_ARGS__);					\

} while (0)



#define IWL_DEBUG_LIMIT(m, level, fmt, args...)				\

#define IWL_DEBUG_LIMIT(m, level, fmt, ...)				\

do {									\

	if (iwl_get_debug_level((m)->shrd) & (level) && net_ratelimit())\

		dev_printk(KERN_ERR, bus(m)->dev,			\

			"%c %s " fmt, in_interrupt() ? 'I' : 'U',	\

			 __func__ , ## args);				\

	if (iwl_get_debug_level((m)->shrd) & (level) &&			\

	    net_ratelimit())						\

		dev_err(bus(m)->dev, "%c %s " fmt,			\

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

			##__VA_ARGS__);					\

} while (0)



#define iwl_print_hex_dump(m, level, p, len)				\
@@ -70,14 +71,18 @@ do { \ 
			       DUMP_PREFIX_OFFSET, 16, 1, p, len, 1);	\

} while (0)



#define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...)			\

#define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...)				\

do {									\

	if (!iwl_is_rfkill(p->shrd))					\

		dev_printk(KERN_ERR, bus(p)->dev, "%c %s " fmt,	\

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

		dev_err(bus(p)->dev, "%s%c %s " fmt,			\

			"",						\

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

			##__VA_ARGS__);					\

	else if	(iwl_get_debug_level(p->shrd) & IWL_DL_RADIO)		\

		dev_printk(KERN_ERR, bus(p)->dev, "(RFKILL) %c %s " fmt, \

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

		dev_err(bus(p)->dev, "%s%c %s " fmt,			\

			"(RFKILL) ",					\

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

			##__VA_ARGS__);					\

} while (0)



#else