Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Joe Perches <joe@perches.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Joe Perches 2011-11-17 17:46:15 -08:00 • committed by John W. Linville
parent 1ffeb2a3e9
commit 1e7aecc26b
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/net/wireless/iwlwifi/iwl-debug.h
View file

@ -47,20 +47,21 @@ do { \
} while (0) } while (0)
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
#define IWL_DEBUG(m, level, fmt, args...) \ #define IWL_DEBUG(m, level, fmt, ...) \
do { \ do { \
if (iwl_get_debug_level((m)->shrd) & (level)) \ if (iwl_get_debug_level((m)->shrd) & (level)) \
dev_printk(KERN_ERR, bus(m)->dev, \ dev_err(bus(m)->dev, "%c %s " fmt, \
"%c %s " fmt, in_interrupt() ? 'I' : 'U', \ in_interrupt() ? 'I' : 'U', __func__, \
__func__ , ## args); \ ##__VA_ARGS__); \
} while (0) } while (0)
#define IWL_DEBUG_LIMIT(m, level, fmt, args...) \ #define IWL_DEBUG_LIMIT(m, level, fmt, ...) \
do { \ do { \
if (iwl_get_debug_level((m)->shrd) & (level) && net_ratelimit())\ if (iwl_get_debug_level((m)->shrd) & (level) && \
dev_printk(KERN_ERR, bus(m)->dev, \ net_ratelimit()) \
"%c %s " fmt, in_interrupt() ? 'I' : 'U', \ dev_err(bus(m)->dev, "%c %s " fmt, \
__func__ , ## args); \ in_interrupt() ? 'I' : 'U', __func__, \
##__VA_ARGS__); \
} while (0) } while (0)
#define iwl_print_hex_dump(m, level, p, len) \ #define iwl_print_hex_dump(m, level, p, len) \
@ -70,14 +71,18 @@ do { \
DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \
} while (0) } while (0)
#define IWL_DEBUG_QUIET_RFKILL(p, fmt, args...) \ #define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...) \
do { \ do { \
if (!iwl_is_rfkill(p->shrd)) \ if (!iwl_is_rfkill(p->shrd)) \
dev_printk(KERN_ERR, bus(p)->dev, "%c %s " fmt, \ dev_err(bus(p)->dev, "%s%c %s " fmt, \
(in_interrupt() ? 'I' : 'U'), __func__ , ##args); \ "", \
else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO) \ in_interrupt() ? 'I' : 'U', __func__, \
dev_printk(KERN_ERR, bus(p)->dev, "(RFKILL) %c %s " fmt, \ ##__VA_ARGS__); \
(in_interrupt() ? 'I' : 'U'), __func__ , ##args); \ else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO) \
dev_err(bus(p)->dev, "%s%c %s " fmt, \
"(RFKILL) ", \
in_interrupt() ? 'I' : 'U', __func__, \
##__VA_ARGS__); \
} while (0) } while (0)
#else #else