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

Commit d0630555 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: merge two remaining brcmf_err macros 



Now we always have __brcmf_err function we can do perfectly fine with
just one macro.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 087fa712

drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h

+5 −9
Original line number Diff line number Diff line
@@ -47,20 +47,16 @@ 


__printf(2, 3)

void __brcmf_err(const char *func, const char *fmt, ...);

#ifndef CONFIG_BRCM_TRACING

/* Macro for error messages. net_ratelimit() is used when driver

 * debugging is not selected. When debugging the driver error

 * messages are as important as other tracing or even more so.

/* Macro for error messages. When debugging / tracing the driver all error

 * messages are important to us.

 */

#define brcmf_err(fmt, ...)						\

	do {								\

		if (IS_ENABLED(CONFIG_BRCMDBG) || net_ratelimit())	\

		if (IS_ENABLED(CONFIG_BRCMDBG) ||			\

		    IS_ENABLED(CONFIG_BRCM_TRACING) ||			\

		    net_ratelimit())					\

			__brcmf_err(__func__, fmt, ##__VA_ARGS__);	\

	} while (0)

#else

#define brcmf_err(fmt, ...) \

	__brcmf_err(__func__, fmt, ##__VA_ARGS__)

#endif



#if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)

__printf(3, 4)