From 121d0318047d57f363a4c302777c89a55be8717b Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 18 Jan 2013 13:24:32 +1100 Subject: [PATCH] --- yaml --- r: 353611 b: refs/heads/master c: 0d4fb6e4cd0e067f7887ed2ce3784b04feafa097 h: refs/heads/master i: 353609: 590c7356a7ae2a048c7b7300a1415fa3d74b93ad 353607: 73272a7e6b196b3d19710ac38eefef5668776947 v: v3 --- [refs] | 2 +- .../net/wireless/ath/wil6210/dbg_hexdump.h | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 86d446d43acf..03cc6985fb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed408f7c0fab7ecc72f94f204f0d2607b2749f69 +refs/heads/master: 0d4fb6e4cd0e067f7887ed2ce3784b04feafa097 diff --git a/trunk/drivers/net/wireless/ath/wil6210/dbg_hexdump.h b/trunk/drivers/net/wireless/ath/wil6210/dbg_hexdump.h index 6a315ba5aa7d..e5712f026c47 100644 --- a/trunk/drivers/net/wireless/ath/wil6210/dbg_hexdump.h +++ b/trunk/drivers/net/wireless/ath/wil6210/dbg_hexdump.h @@ -1,25 +1,15 @@ #ifndef WIL_DBG_HEXDUMP_H_ #define WIL_DBG_HEXDUMP_H_ -#if defined(CONFIG_DYNAMIC_DEBUG) -#define wil_dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ - 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) +#include +#include +#if defined(CONFIG_DYNAMIC_DEBUG) #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ 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) -#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) */ #define wil_print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \