drivers/net/wireless/b43legacy/main.c: Use printf extension %pV
Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
5b736d42bc
commit
0e67d6cb75
|
@ -181,52 +181,75 @@ static int b43legacy_ratelimit(struct b43legacy_wl *wl)
|
||||||
|
|
||||||
void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
|
void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
struct va_format vaf;
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
if (!b43legacy_ratelimit(wl))
|
if (!b43legacy_ratelimit(wl))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
va_start(args, fmt);
|
va_start(args, fmt);
|
||||||
printk(KERN_INFO "b43legacy-%s: ",
|
|
||||||
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
|
vaf.fmt = fmt;
|
||||||
vprintk(fmt, args);
|
vaf.va = &args;
|
||||||
|
|
||||||
|
printk(KERN_INFO "b43legacy-%s: %pV",
|
||||||
|
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
|
||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
|
void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
struct va_format vaf;
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
if (!b43legacy_ratelimit(wl))
|
if (!b43legacy_ratelimit(wl))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
va_start(args, fmt);
|
va_start(args, fmt);
|
||||||
printk(KERN_ERR "b43legacy-%s ERROR: ",
|
|
||||||
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
|
vaf.fmt = fmt;
|
||||||
vprintk(fmt, args);
|
vaf.va = &args;
|
||||||
|
|
||||||
|
printk(KERN_ERR "b43legacy-%s ERROR: %pV",
|
||||||
|
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
|
||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
|
void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
struct va_format vaf;
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
if (!b43legacy_ratelimit(wl))
|
if (!b43legacy_ratelimit(wl))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
va_start(args, fmt);
|
va_start(args, fmt);
|
||||||
printk(KERN_WARNING "b43legacy-%s warning: ",
|
|
||||||
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
|
vaf.fmt = fmt;
|
||||||
vprintk(fmt, args);
|
vaf.va = &args;
|
||||||
|
|
||||||
|
printk(KERN_WARNING "b43legacy-%s warning: %pV",
|
||||||
|
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
|
||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if B43legacy_DEBUG
|
#if B43legacy_DEBUG
|
||||||
void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
|
void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
struct va_format vaf;
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
||||||
va_start(args, fmt);
|
va_start(args, fmt);
|
||||||
printk(KERN_DEBUG "b43legacy-%s debug: ",
|
|
||||||
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
|
vaf.fmt = fmt;
|
||||||
vprintk(fmt, args);
|
vaf.va = &args;
|
||||||
|
|
||||||
|
printk(KERN_DEBUG "b43legacy-%s debug: %pV",
|
||||||
|
(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
|
||||||
|
|
||||||
va_end(args);
|
va_end(args);
|
||||||
}
|
}
|
||||||
#endif /* DEBUG */
|
#endif /* DEBUG */
|
||||||
|
|
Loading…
Reference in New Issue