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

Commit 5b736d42 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

drivers/net/wireless/b43/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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7e559ec3

drivers/net/wireless/b43/main.c

+36 −12
Original line number Diff line number Diff line
@@ -322,59 +322,83 @@ static int b43_ratelimit(struct b43_wl *wl) 


void b43info(struct b43_wl *wl, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	if (b43_modparam_verbose < B43_VERBOSITY_INFO)

		return;

	if (!b43_ratelimit(wl))

		return;



	va_start(args, fmt);

	printk(KERN_INFO "b43-%s: ",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");

	vprintk(fmt, args);



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_INFO "b43-%s: %pV",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);



	va_end(args);

}



void b43err(struct b43_wl *wl, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	if (b43_modparam_verbose < B43_VERBOSITY_ERROR)

		return;

	if (!b43_ratelimit(wl))

		return;



	va_start(args, fmt);

	printk(KERN_ERR "b43-%s ERROR: ",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");

	vprintk(fmt, args);



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_ERR "b43-%s ERROR: %pV",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);



	va_end(args);

}



void b43warn(struct b43_wl *wl, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	if (b43_modparam_verbose < B43_VERBOSITY_WARN)

		return;

	if (!b43_ratelimit(wl))

		return;



	va_start(args, fmt);

	printk(KERN_WARNING "b43-%s warning: ",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");

	vprintk(fmt, args);



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_WARNING "b43-%s warning: %pV",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);



	va_end(args);

}



void b43dbg(struct b43_wl *wl, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	if (b43_modparam_verbose < B43_VERBOSITY_DEBUG)

		return;



	va_start(args, fmt);

	printk(KERN_DEBUG "b43-%s debug: ",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");

	vprintk(fmt, args);



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_DEBUG "b43-%s debug: %pV",

	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);



	va_end(args);

}