Commit 9c376639 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

include/net/cfg80211.h: wiphy_<level> messages use dev_printk



The output becomes:

[   41.261941] ieee80211 phy0: Selected rate control algorithm 'minstrel_ht'
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78381c41
......@@ -2558,49 +2558,36 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
/* wiphy_printk helpers, similar to dev_printk */
#define wiphy_printk(level, wiphy, format, args...) \
printk(level "%s: " format, wiphy_name(wiphy), ##args)
dev_printk(level, &(wiphy)->dev, format, ##args)
#define wiphy_emerg(wiphy, format, args...) \
wiphy_printk(KERN_EMERG, wiphy, format, ##args)
dev_emerg(&(wiphy)->dev, format, ##args)
#define wiphy_alert(wiphy, format, args...) \
wiphy_printk(KERN_ALERT, wiphy, format, ##args)
dev_alert(&(wiphy)->dev, format, ##args)
#define wiphy_crit(wiphy, format, args...) \
wiphy_printk(KERN_CRIT, wiphy, format, ##args)
dev_crit(&(wiphy)->dev, format, ##args)
#define wiphy_err(wiphy, format, args...) \
wiphy_printk(KERN_ERR, wiphy, format, ##args)
dev_err(&(wiphy)->dev, format, ##args)
#define wiphy_warn(wiphy, format, args...) \
wiphy_printk(KERN_WARNING, wiphy, format, ##args)
dev_warn(&(wiphy)->dev, format, ##args)
#define wiphy_notice(wiphy, format, args...) \
wiphy_printk(KERN_NOTICE, wiphy, format, ##args)
dev_notice(&(wiphy)->dev, format, ##args)
#define wiphy_info(wiphy, format, args...) \
wiphy_printk(KERN_INFO, wiphy, format, ##args)
dev_info(&(wiphy)->dev, format, ##args)
int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
#if defined(DEBUG)
#define wiphy_dbg(wiphy, format, args...) \
#define wiphy_debug(wiphy, format, args...) \
wiphy_printk(KERN_DEBUG, wiphy, format, ##args)
#elif defined(CONFIG_DYNAMIC_DEBUG)
#define wiphy_dbg(wiphy, format, args...) \
dynamic_pr_debug("%s: " format, wiphy_name(wiphy), ##args)
#else
#define wiphy_dbg(wiphy, format, args...) \
({ \
if (0) \
wiphy_printk(KERN_DEBUG, wiphy, format, ##args); \
0; \
})
#endif
dev_dbg(&(wiphy)->dev, format, ##args)
#if defined(VERBOSE_DEBUG)
#define wiphy_vdbg wiphy_dbg
#else
#define wiphy_vdbg(wiphy, format, args...) \
({ \
if (0) \
wiphy_printk(KERN_DEBUG, wiphy, format, ##args); \
0; \
0; \
})
#endif
......
......@@ -912,52 +912,3 @@ static void __exit cfg80211_exit(void)
destroy_workqueue(cfg80211_wq);
}
module_exit(cfg80211_exit);
static int ___wiphy_printk(const char *level, const struct wiphy *wiphy,
struct va_format *vaf)
{
if (!wiphy)
return printk("%s(NULL wiphy *): %pV", level, vaf);
return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf);
}
int __wiphy_printk(const char *level, const struct wiphy *wiphy,
const char *fmt, ...)
{
struct va_format vaf;
va_list args;
int r;
va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args;
r = ___wiphy_printk(level, wiphy, &vaf);
va_end(args);
return r;
}
EXPORT_SYMBOL(__wiphy_printk);
#define define_wiphy_printk_level(func, kern_level) \
int func(const struct wiphy *wiphy, const char *fmt, ...) \
{ \
struct va_format vaf; \
va_list args; \
int r; \
\
va_start(args, fmt); \
\
vaf.fmt = fmt; \
vaf.va = &args; \
\
r = ___wiphy_printk(kern_level, wiphy, &vaf); \
va_end(args); \
\
return r; \
} \
EXPORT_SYMBOL(func);
define_wiphy_printk_level(wiphy_debug, KERN_DEBUG);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment