2008-05-23 10:17:08

by Holger Schurig

Subject: [PATCH] libertas: use lbs_pr_XX instead of printk

... because lbs_pr_XXX prefixes all messages with "libertas: "

Signed-off-by: Holger Schurig <[email protected]>

--- linux.orig/drivers/net/wireless/libertas/cmd.c
+++ linux/drivers/net/wireless/libertas/cmd.c
@@ -110,7 +110,7 @@
* CF card firmware 5.0.16p0: cap 0x00000303
* USB dongle firmware 5.110.17p2: cap 0x00000303
*/
- printk("libertas: %s, fw %u.%u.%up%u, cap 0x%08x\n",
+ lbs_pr_info("%s, fw %u.%u.%up%u, cap 0x%08x\n",
print_mac(mac, cmd.permanentaddr),
priv->fwrelease >> 24 & 0xff,
priv->fwrelease >> 16 & 0xff,
--- linux.orig/drivers/net/wireless/libertas/persistcfg.c
+++ linux/drivers/net/wireless/libertas/persistcfg.c
@@ -188,7 +188,7 @@
return ret;

if (defs.meshie.val.mesh_id_len > IW_ESSID_MAX_SIZE) {
- printk(KERN_ERR "Inconsistent mesh ID length");
+ lbs_pr_err("inconsistent mesh ID length");
defs.meshie.val.mesh_id_len = IW_ESSID_MAX_SIZE;
}

2008-05-23 13:40:45

by Dan Williams

Subject: Re: [PATCH] libertas: use lbs_pr_XX instead of printk

On Fri, 2008-05-23 at 12:16 +0200, Holger Schurig wrote:
> ... because lbs_pr_XXX prefixes all messages with "libertas: "
>
> Signed-off-by: Holger Schurig <[email protected]>

Acked-by: Dan Williams <[email protected]>

> --- linux.orig/drivers/net/wireless/libertas/cmd.c
> +++ linux/drivers/net/wireless/libertas/cmd.c
> @@ -110,7 +110,7 @@
> * CF card firmware 5.0.16p0: cap 0x00000303
> * USB dongle firmware 5.110.17p2: cap 0x00000303
> */
> - printk("libertas: %s, fw %u.%u.%up%u, cap 0x%08x\n",
> + lbs_pr_info("%s, fw %u.%u.%up%u, cap 0x%08x\n",
> print_mac(mac, cmd.permanentaddr),
> priv->fwrelease >> 24 & 0xff,
> priv->fwrelease >> 16 & 0xff,
> --- linux.orig/drivers/net/wireless/libertas/persistcfg.c
> +++ linux/drivers/net/wireless/libertas/persistcfg.c
> @@ -188,7 +188,7 @@
> return ret;
>
> if (defs.meshie.val.mesh_id_len > IW_ESSID_MAX_SIZE) {
> - printk(KERN_ERR "Inconsistent mesh ID length");
> + lbs_pr_err("inconsistent mesh ID length");
> defs.meshie.val.mesh_id_len = IW_ESSID_MAX_SIZE;
> }
>