diff options
| author | Joe Perches <joe@perches.com> | 2010-08-21 00:13:59 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 21:19:44 +0200 |
| commit | 9c376639297d3dd82d40e54c9cdca8da9dfc22f1 (patch) | |
| tree | 4efdf23817f1ab3d90783f0f6335109537f174fd /net/wireless | |
| parent | wl1271: remove warnings in wl1271_sdio_set_power (diff) | |
| download | linux-9c376639297d3dd82d40e54c9cdca8da9dfc22f1.tar.xz linux-9c376639297d3dd82d40e54c9cdca8da9dfc22f1.zip | |
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: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index d52630bbab04..b8191cf86226 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -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); |