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

Commit 0d4fb6e4 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Greg Kroah-Hartman
Browse files

wireless: remove conflicting version of print_hex_dump_bytes 



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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed408f7c

drivers/net/wireless/ath/wil6210/dbg_hexdump.h

+4 −14
Original line number Diff line number Diff line 
#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 <linux/printk.h>

#include <linux/dynamic_debug.h>



#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)		\