lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless: remove conflicting version of print_hex_dump_bytes

Browse Source 
This fixes the build due to there now being two copies of print_hex_dump_bytes
in the tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stephen Rothwell
2013-01-18 13:24:32 +11:00
committed by Greg Kroah-Hartman
parent ed408f7c0f
commit 0d4fb6e4cd
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/wil6210/dbg_hexdump.h
View File

@@ -1,25 +1,15 @@
#ifndef WIL_DBG_HEXDUMP_H_ #ifndef WIL_DBG_HEXDUMP_H_
#define WIL_DBG_HEXDUMP_H_ #define WIL_DBG_HEXDUMP_H_
#if defined(CONFIG_DYNAMIC_DEBUG) #include <linux/printk.h>
#define wil_dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ #include <linux/dynamic_debug.h>
groupsize, buf, len, ascii) \
do { \
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, \
__builtin_constant_p(prefix_str) ? prefix_str : "hexdump");\
if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \
print_hex_dump(KERN_DEBUG, prefix_str, \
prefix_type, rowsize, groupsize, \
buf, len, ascii); \
} while (0)
#if defined(CONFIG_DYNAMIC_DEBUG)
#define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \
groupsize, buf, len, ascii) \ groupsize, buf, len, ascii) \
wil_dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ dynamic_hex_dump(prefix_str, prefix_type, rowsize, \
groupsize, buf, len, ascii) groupsize, buf, len, ascii)
#define print_hex_dump_bytes(prefix_str, prefix_type, buf, len) \
wil_dynamic_hex_dump(prefix_str, prefix_type, 16, 1, buf, len, true)
#else /* defined(CONFIG_DYNAMIC_DEBUG) */ #else /* defined(CONFIG_DYNAMIC_DEBUG) */
#define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \
groupsize, buf, len, ascii) \ groupsize, buf, len, ascii) \