From 6e53191d6e15b7afb71dfbd3134c567fcc4eb2cd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Aug 2015 11:17:57 -0700 Subject: [PATCH] staging: wilc1000: delete wilc_log.h The macros are not used in the driver at all, except in one commented out line, so just remove the .h file so that no one thinks it is a good idea to add any code to use them in the future. Cc: Johnny Kim Cc: Rachel Kim Cc: Dean Lee Cc: Chris Park Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/coreconfigurator.c | 2 - drivers/staging/wilc1000/wilc_log.h | 47 --------------------- drivers/staging/wilc1000/wilc_oswrapper.h | 3 -- 3 files changed, 52 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_log.h diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index c81c41d77c30..1a5b16577fd5 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -1438,8 +1438,6 @@ void ProcessAdrWid(char *pcPacket, s32 *ps32PktLen, void ProcessBinWid(char *pcPacket, s32 *ps32PktLen, tstrWID *pstrWID, u8 *pu8val, s32 s32ValueSize) { - /* WILC_ERROR("processing Binary WIDs is not supported\n"); */ - u16 u16MsgLen = 0; u16 idx = 0; s32 s32PktLen = *ps32PktLen; diff --git a/drivers/staging/wilc1000/wilc_log.h b/drivers/staging/wilc1000/wilc_log.h deleted file mode 100644 index 2269ebdec129..000000000000 --- a/drivers/staging/wilc1000/wilc_log.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef __WILC_LOG_H__ -#define __WILC_LOG_H__ - -/* Errors will always get printed */ -#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__, __WILC_LINE__); \ - WILC_PRINTF(__VA_ARGS__); \ - } while (0) - -/* Wraning only printed if verbosity is 1 or more */ -#if (WILC_LOG_VERBOSITY_LEVEL > 0) -#define WILC_WARN(...) do { WILC_PRINTF("(WRN)"); \ - WILC_PRINTF(__VA_ARGS__); \ - } while (0) -#else -#define WILC_WARN(...) (0) -#endif - -/* Info only printed if verbosity is 2 or more */ -#if (WILC_LOG_VERBOSITY_LEVEL > 1) -#define WILC_INFO(...) do { WILC_PRINTF("(INF)"); \ - WILC_PRINTF(__VA_ARGS__); \ - } while (0) -#else -#define WILC_INFO(...) (0) -#endif - -/* Debug is only printed if verbosity is 3 or more */ -#if (WILC_LOG_VERBOSITY_LEVEL > 2) -#define WILC_DBG(...) do { WILC_PRINTF("(DBG)(%s:%d) ", __WILC_FUNCTION__, __WILC_LINE__); \ - WILC_PRINTF(__VA_ARGS__); \ - } while (0) - -#else -#define WILC_DBG(...) (0) -#endif - -/* Function In/Out is only printed if verbosity is 4 or more */ -#if (WILC_LOG_VERBOSITY_LEVEL > 3) -#define WILC_FN_IN do { WILC_PRINTF("(FIN) (%s:%d) \n", __WILC_FUNCTION__, __WILC_LINE__); } while (0) -#define WILC_FN_OUT(ret) do { WILC_PRINTF("(FOUT) (%s:%d) %d.\n", __WILC_FUNCTION__, __WILC_LINE__, (ret)); } while (0) -#else -#define WILC_FN_IN (0) -#define WILC_FN_OUT(ret) (0) -#endif - - -#endif \ No newline at end of file diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h index 456a8bb60835..ca575c9abd35 100644 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ b/drivers/staging/wilc1000/wilc_oswrapper.h @@ -17,9 +17,6 @@ #include "wilc_osconfig.h" #include "wilc_platform.h" -/* Logging Functions */ -#include "wilc_log.h" - /* Error reporting and handling support */ #include "wilc_errorsupport.h" -- 2.39.2