[PATCH wireless-next 00/20] Use pr_<level>

[PATCH wireless-next 00/20] Use pr_<level>

[Joe Perches]

Update logging style

Joe Perches (20):
  adm8211: Use pr_<level>
  airo_cs: Use pr_<level>
  at76c50x-usb: Use pr_<level>
  atmel: atmel_cs: Use pr_<level>
  b43: Use pr_<level>
  b43legacy: Use pr_<level>
  hostap: Use pr_<level>
  ipw2x00: Use pr_<level>
  libertas: Use pr_<level>
  libertas_tf: Use pr_<level>
  mac80211_hwsim: Use pr_<level>
  mwl8k: Use pr_<level>
  orinoco: Use pr_<level>
  p54: Use pr_<level>
  prism54: Use pr_<level>
  ray_cs: Use pr_<level>
  rtl818x: Use pr_<level>
  ti: Use pr_<level>
  wl3501_cs: Use pr_<level>
  zd_usb: Use pr_<level>

 drivers/net/wireless/adm8211.c                |   67 ++--
 drivers/net/wireless/airo_cs.c                |    4 +-
 drivers/net/wireless/at76c50x-usb.c           |   15 +-
 drivers/net/wireless/atmel.c                  |   71 ++--
 drivers/net/wireless/atmel_cs.c               |    4 +-
 drivers/net/wireless/b43/debugfs.c            |   20 +-
 drivers/net/wireless/b43/main.c               |   41 +--
 drivers/net/wireless/b43/pcmcia.c             |    5 +-
 drivers/net/wireless/b43legacy/b43legacy.h    |   14 +-
 drivers/net/wireless/b43legacy/debugfs.c      |    4 +-
 drivers/net/wireless/b43legacy/dma.c          |    2 +
 drivers/net/wireless/b43legacy/main.c         |   16 +-
 drivers/net/wireless/b43legacy/phy.c          |    2 +
 drivers/net/wireless/b43legacy/radio.c        |    5 +-
 drivers/net/wireless/b43legacy/xmit.c         |    2 +
 drivers/net/wireless/hostap/hostap_80211_rx.c |  125 ++++----
 drivers/net/wireless/hostap/hostap_80211_tx.c |   78 ++---
 drivers/net/wireless/hostap/hostap_ap.c       |   77 ++---
 drivers/net/wireless/hostap/hostap_cs.c       |   53 ++--
 drivers/net/wireless/hostap/hostap_download.c |  143 ++++-----
 drivers/net/wireless/hostap/hostap_hw.c       |  438 +++++++++++--------------
 drivers/net/wireless/hostap/hostap_info.c     |   36 +-
 drivers/net/wireless/hostap/hostap_ioctl.c    |  175 +++++------
 drivers/net/wireless/hostap/hostap_main.c     |  142 ++++-----
 drivers/net/wireless/hostap/hostap_pci.c      |   26 +-
 drivers/net/wireless/hostap/hostap_plx.c      |   69 ++---
 drivers/net/wireless/hostap/hostap_proc.c     |   18 +-
 drivers/net/wireless/hostap/hostap_wlan.h     |   16 +-
 drivers/net/wireless/ipw2x00/ipw2100.c        |  225 +++++--------
 drivers/net/wireless/ipw2x00/ipw2100.h        |    4 +-
 drivers/net/wireless/ipw2x00/ipw2200.c        |   54 ++--
 drivers/net/wireless/ipw2x00/ipw2200.h        |   36 ++-
 drivers/net/wireless/ipw2x00/libipw.h         |   24 +-
 drivers/net/wireless/ipw2x00/libipw_geo.c     |    3 +
 drivers/net/wireless/ipw2x00/libipw_module.c  |    9 +-
 drivers/net/wireless/ipw2x00/libipw_rx.c      |   49 ++--
 drivers/net/wireless/ipw2x00/libipw_tx.c      |   11 +-
 drivers/net/wireless/ipw2x00/libipw_wx.c      |    4 +-
 drivers/net/wireless/libertas/cmd.c           |    2 +
 drivers/net/wireless/libertas/cmdresp.c       |    2 +
 drivers/net/wireless/libertas/if_cs.c         |   14 +-
 drivers/net/wireless/libertas/if_sdio.c       |    6 +-
 drivers/net/wireless/libertas/if_spi.c        |    4 +-
 drivers/net/wireless/libertas/if_usb.c        |    4 +-
 drivers/net/wireless/libertas/tx.c            |    3 +
 drivers/net/wireless/libertas_tf/cmd.c        |   12 +-
 drivers/net/wireless/libertas_tf/deb_defs.h   |  105 ++++--
 drivers/net/wireless/libertas_tf/if_usb.c     |    2 +-
 drivers/net/wireless/libertas_tf/main.c       |   14 +-
 drivers/net/wireless/mac80211_hwsim.c         |   61 ++--
 drivers/net/wireless/mwl8k.c                  |   53 ++--
 drivers/net/wireless/orinoco/airport.c        |   28 +-
 drivers/net/wireless/orinoco/cfg.c            |    9 +-
 drivers/net/wireless/orinoco/hermes.c         |   71 ++--
 drivers/net/wireless/orinoco/hw.c             |   79 ++---
 drivers/net/wireless/orinoco/main.c           |  194 +++++------
 drivers/net/wireless/orinoco/mic.c            |   13 +-
 drivers/net/wireless/orinoco/orinoco.h        |   13 +-
 drivers/net/wireless/orinoco/orinoco_cs.c     |   11 +-
 drivers/net/wireless/orinoco/orinoco_nortel.c |   40 ++--
 drivers/net/wireless/orinoco/orinoco_pci.c    |   23 +-
 drivers/net/wireless/orinoco/orinoco_pci.h    |    6 +-
 drivers/net/wireless/orinoco/orinoco_plx.c    |   40 ++--
 drivers/net/wireless/orinoco/orinoco_tmd.c    |   25 +-
 drivers/net/wireless/orinoco/orinoco_usb.c    |  145 ++++-----
 drivers/net/wireless/orinoco/scan.c           |   16 +-
 drivers/net/wireless/orinoco/spectrum_cs.c    |    6 +-
 drivers/net/wireless/orinoco/wext.c           |   28 +-
 drivers/net/wireless/p54/fwio.c               |    6 +-
 drivers/net/wireless/p54/p54spi.c             |    4 +-
 drivers/net/wireless/prism54/isl_ioctl.c      |   69 ++--
 drivers/net/wireless/prism54/islpci_dev.c     |   57 ++--
 drivers/net/wireless/prism54/islpci_eth.c     |   25 +-
 drivers/net/wireless/prism54/islpci_hotplug.c |   34 +-
 drivers/net/wireless/prism54/islpci_mgt.c     |   75 ++---
 drivers/net/wireless/prism54/islpci_mgt.h     |    9 +-
 drivers/net/wireless/prism54/oid_mgt.c        |   23 +-
 drivers/net/wireless/ray_cs.c                 |  147 ++++-----
 drivers/net/wireless/rtl818x/rtl8180/dev.c    |   35 +--
 drivers/net/wireless/rtl818x/rtl8187/dev.c    |   15 +-
 drivers/net/wireless/rtl818x/rtl8187/leds.c   |    6 +-
 drivers/net/wireless/rtl818x/rtl8187/rfkill.c |    9 +-
 drivers/net/wireless/ti/wl1251/acx.c          |  151 +++++-----
 drivers/net/wireless/ti/wl1251/boot.c         |   51 ++--
 drivers/net/wireless/ti/wl1251/cmd.c          |   76 +++---
 drivers/net/wireless/ti/wl1251/init.c         |   16 +-
 drivers/net/wireless/ti/wl1251/io.c           |   27 +-
 drivers/net/wireless/ti/wl1251/main.c         |  103 +++---
 drivers/net/wireless/ti/wl1251/ps.c           |   16 +-
 drivers/net/wireless/ti/wl1251/rx.c           |    8 +-
 drivers/net/wireless/ti/wl1251/sdio.c         |   20 +-
 drivers/net/wireless/ti/wl1251/spi.c          |   20 +-
 drivers/net/wireless/ti/wl1251/tx.c           |   21 +-
 drivers/net/wireless/ti/wl1251/wl1251.h       |   20 +-
 drivers/net/wireless/ti/wl12xx/acx.c          |    2 +-
 drivers/net/wireless/ti/wl12xx/cmd.c          |   18 +-
 drivers/net/wireless/ti/wl12xx/main.c         |   39 ++-
 drivers/net/wireless/ti/wl18xx/acx.c          |   12 +-
 drivers/net/wireless/ti/wl18xx/main.c         |   54 ++--
 drivers/net/wireless/ti/wl18xx/tx.c           |   10 +-
 drivers/net/wireless/ti/wlcore/acx.c          |  229 +++++++-------
 drivers/net/wireless/ti/wlcore/boot.c         |   56 ++--
 drivers/net/wireless/ti/wlcore/cmd.c          |  164 +++++-----
 drivers/net/wireless/ti/wlcore/debug.h        |   22 +-
 drivers/net/wireless/ti/wlcore/debugfs.c      |   42 ++--
 drivers/net/wireless/ti/wlcore/event.c        |   16 +-
 drivers/net/wireless/ti/wlcore/main.c         |  281 ++++++++--------
 drivers/net/wireless/ti/wlcore/ps.c           |   34 +-
 drivers/net/wireless/ti/wlcore/rx.c           |   33 +-
 drivers/net/wireless/ti/wlcore/scan.c         |   68 ++--
 drivers/net/wireless/ti/wlcore/sdio.c         |    3 +-
 drivers/net/wireless/ti/wlcore/testmode.c     |   16 +-
 drivers/net/wireless/ti/wlcore/tx.c           |   23 +-
 drivers/net/wireless/wl3501_cs.c              |   80 +++---
 drivers/net/wireless/zd1211rw/zd_usb.c        |   13 +-
 115 files changed, 2579 insertions(+), 2795 deletions(-)

-- 
1.7.8.111.gad25c.dirty

[PATCH wireless-next 05/20] b43: Use pr_<level>

[Joe Perches]

Use a more current logging style.

Convert printks to pr_<level>.
Coalesce formats, align arguments.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/wireless/b43/debugfs.c |   20 +++++++++--------
 drivers/net/wireless/b43/main.c    |   41 ++++++++++++++++-------------------
 drivers/net/wireless/b43/pcmcia.c  |    5 ++-
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index e807bd9..1feebd9 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -23,6 +23,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
@@ -61,15 +63,15 @@ struct b43_dfs_file *fops_to_dfs_file(struct b43_wldev *dev,
 }
 
 
-#define fappend(fmt, x...)	\
-	do {							\
-		if (bufsize - count)				\
-			count += snprintf(buf + count,		\
-					  bufsize - count,	\
-					  fmt , ##x);		\
-		else						\
-			printk(KERN_ERR "b43: fappend overflow\n"); \
-	} while (0)
+#define fappend(fmt, x...)					\
+do {								\
+	if (bufsize - count)					\
+		count += snprintf(buf + count,			\
+				  bufsize - count,		\
+				  fmt , ##x);			\
+	else							\
+		pr_err("fappend overflow\n");			\
+} while (0)
 
 
 /* The biggest address values for SHM access from the debugfs files. */
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index acd03a4..2bcedce 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -32,6 +32,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -354,8 +356,8 @@ void b43info(struct b43_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_INFO "b43-%s: %pV",
-	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+	pr_info("%s: %pV",
+		(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
 }
@@ -375,7 +377,7 @@ void b43err(struct b43_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_ERR "b43-%s ERROR: %pV",
+	pr_err("%s ERROR: %pV",
 	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
@@ -396,8 +398,8 @@ void b43warn(struct b43_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_WARNING "b43-%s warning: %pV",
-	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+	pr_warn("%s warning: %pV",
+		(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
 }
@@ -415,7 +417,7 @@ void b43dbg(struct b43_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_DEBUG "b43-%s debug: %pV",
+	printk(KERN_DEBUG pr_fmt("%s debug: %pV"),
 	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
@@ -1069,7 +1071,7 @@ static void b43_dump_keymemory(struct b43_wldev *dev)
 	}
 	for (index = 0; index < count; index++) {
 		key = &(dev->key[index]);
-		printk(KERN_DEBUG "Key slot %02u: %s",
+		printk(KERN_DEBUG pr_fmt("Key slot %02u: %s"),
 		       index, (key->keyconf == NULL) ? " " : "*");
 		offset = dev->ktp + (index * B43_SEC_KEYSIZE);
 		for (i = 0; i < B43_SEC_KEYSIZE; i += 2) {
@@ -1794,7 +1796,7 @@ static void b43_handle_firmware_panic(struct b43_wldev *dev)
 
 static void handle_irq_ucode_debug(struct b43_wldev *dev)
 {
-	unsigned int i, cnt;
+	unsigned int i;
 	u16 reason, marker_id, marker_line;
 	__le16 *buf;
 
@@ -1830,18 +1832,15 @@ static void handle_irq_ucode_debug(struct b43_wldev *dev)
 		if (!B43_DEBUG)
 			break; /* Only with driver debugging enabled. */
 		b43info(dev->wl, "Microcode register dump:\n");
-		for (i = 0, cnt = 0; i < 64; i++) {
+		for (i = 0; i < 64; i++) {
 			u16 tmp = b43_shm_read16(dev, B43_SHM_SCRATCH, i);
-			if (cnt == 0)
-				printk(KERN_INFO);
-			printk("r%02u: 0x%04X  ", i, tmp);
-			cnt++;
-			if (cnt == 6) {
-				printk("\n");
-				cnt = 0;
-			}
+			if (!(i % 6))
+				pr_info("");
+			
+			pr_cont("r%02u: 0x%04X%s",
+				i, tmp, (i % 6) != 5 ? "  " : "\n");
 		}
-		printk("\n");
+		pr_cont("\n");
 		break;
 	case B43_DEBUGIRQ_MARKER:
 		if (!B43_DEBUG)
@@ -5509,10 +5508,8 @@ static void b43_print_driverinfo(void)
 #ifdef CONFIG_B43_SDIO
 	feat_sdio = "S";
 #endif
-	printk(KERN_INFO "Broadcom 43xx driver loaded "
-	       "[ Features: %s%s%s%s%s ]\n",
-	       feat_pci, feat_pcmcia, feat_nphy,
-	       feat_leds, feat_sdio);
+	pr_info("Broadcom 43xx driver loaded [ Features: %s%s%s%s%s ]\n",
+		feat_pci, feat_pcmcia, feat_nphy, feat_leds, feat_sdio);
 }
 
 static int __init b43_init(void)
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 714cad6..0c0751a 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -21,6 +21,8 @@
 
 */
 
+#define pr_fmt(fmt) "b43-pcmcia: " fmt
+
 #include "pcmcia.h"
 
 #include <linux/ssb/ssb.h>
@@ -105,8 +107,7 @@ err_disable:
 err_kfree_ssb:
 	kfree(ssb);
 out_error:
-	printk(KERN_ERR "b43-pcmcia: Initialization failed (%d, %d)\n",
-	       res, err);
+	pr_err("Initialization failed (%d, %d)\n", res, err);
 	return err;
 }
 
-- 
1.7.8.111.gad25c.dirty

[PATCH wireless-next 06/20] b43legacy: Use pr_<level>

[Joe Perches]

Use a more current logging style.

Convert printks to pr_<level>.
Coalesce formats, align arguments.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/wireless/b43legacy/b43legacy.h |   14 ++++++--------
 drivers/net/wireless/b43legacy/debugfs.c   |    4 +++-
 drivers/net/wireless/b43legacy/dma.c       |    2 ++
 drivers/net/wireless/b43legacy/main.c      |   16 +++++++++-------
 drivers/net/wireless/b43legacy/phy.c       |    2 ++
 drivers/net/wireless/b43legacy/radio.c     |    5 +++--
 drivers/net/wireless/b43legacy/xmit.c      |    2 ++
 7 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index a29da67..e77083e 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -325,20 +325,18 @@ enum {
 #define B43legacy_SBIMSTATE_IB_ERROR		0x20000
 #define B43legacy_SBIMSTATE_TIMEOUT		0x40000
 
-#define PFX		KBUILD_MODNAME ": "
 #ifdef assert
 # undef assert
 #endif
 #ifdef CONFIG_B43LEGACY_DEBUG
 # define B43legacy_WARN_ON(x)	WARN_ON(x)
 # define B43legacy_BUG_ON(expr)						\
-	do {								\
-		if (unlikely((expr))) {					\
-			printk(KERN_INFO PFX "Test (%s) failed\n",	\
-					      #expr);			\
-			BUG_ON(expr);					\
-		}							\
-	} while (0)
+do {									\
+	if (unlikely((expr))) {						\
+		pr_info("Test (%s) failed\n", #expr);			\
+		BUG_ON(expr);						\
+	}								\
+} while (0)
 # define B43legacy_DEBUG	1
 #else
 /* This will evaluate the argument even if debugging is disabled. */
diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
index 1965edb..7678005 100644
--- a/drivers/net/wireless/b43legacy/debugfs.c
+++ b/drivers/net/wireless/b43legacy/debugfs.c
@@ -23,6 +23,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/fs.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
@@ -71,7 +73,7 @@ struct b43legacy_dfs_file * fops_to_dfs_file(struct b43legacy_wldev *dev,
 					  bufsize - count,	\
 					  fmt , ##x);		\
 		else						\
-			printk(KERN_ERR "b43legacy: fappend overflow\n"); \
+			pr_err("fappend overflow\n");		\
 	} while (0)
 
 
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index f1f8bd0..6b42488 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -27,6 +27,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "b43legacy.h"
 #include "dma.h"
 #include "main.h"
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 8b06ca5..b0536a5 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -29,6 +29,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -190,8 +192,8 @@ void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_INFO "b43legacy-%s: %pV",
-	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+	pr_info("%s: %pV",
+		(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
 }
@@ -209,7 +211,7 @@ void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_ERR "b43legacy-%s ERROR: %pV",
+	pr_err("%s ERROR: %pV",
 	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
@@ -228,8 +230,8 @@ void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_WARNING "b43legacy-%s warning: %pV",
-	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+	pr_warn("%s warning: %pV",
+		(wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
 }
@@ -245,7 +247,7 @@ void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
-	printk(KERN_DEBUG "b43legacy-%s debug: %pV",
+	printk(KERN_DEBUG pr_fmt("%s debug: %pV"),
 	       (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
 
 	va_end(args);
@@ -4001,7 +4003,7 @@ static void b43legacy_print_driverinfo(void)
 #ifdef CONFIG_B43LEGACY_DMA
 	feat_dma = "D";
 #endif
-	printk(KERN_INFO "Broadcom 43xx-legacy driver loaded "
+	pr_info("Broadcom 43xx-legacy driver loaded "
 	       "[ Features: %s%s%s%s ]\n",
 	       feat_pci, feat_leds, feat_pio, feat_dma);
 }
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 995c7d0..e03851d 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -29,6 +29,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/sched.h>
diff --git a/drivers/net/wireless/b43legacy/radio.c b/drivers/net/wireless/b43legacy/radio.c
index 8961776..ff3f996 100644
--- a/drivers/net/wireless/b43legacy/radio.c
+++ b/drivers/net/wireless/b43legacy/radio.c
@@ -29,6 +29,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/delay.h>
 
 #include "b43legacy.h"
@@ -78,8 +80,7 @@ u16 channel2freq_bg(u8 channel)
 	};
 
 	if (unlikely(channel < 1 || channel > 14)) {
-		printk(KERN_INFO "b43legacy: Channel %d is out of range\n",
-				  channel);
+		pr_info("Channel %d is out of range\n", channel);
 		dump_stack();
 		return 2412;
 	}
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index a8012f2..385eb72 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -28,6 +28,8 @@
 
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <net/dst.h>
 
 #include "xmit.h"
-- 
1.7.8.111.gad25c.dirty

[PATCH wireless-next 00/20] Use pr_<level>

[Johannes Berg]

On Thu, 2012-06-14 at 22:53 -0700, Joe Perches wrote:
> Update logging style

So ... since we make everybody else explain *why* they make a change, I
think you should too. I don't see a reason for this random patching of
perfectly good code.

johannes

[PATCH wireless-next 00/20] Use pr_<level>

[Joe Perches]

On Fri, 2012-06-15 at 09:36 +0200, Johannes Berg wrote:
> On Thu, 2012-06-14 at 22:53 -0700, Joe Perches wrote:
> > Update logging style
> 
> So ... since we make everybody else explain *why* they make a change, I
> think you should too.

To improve logging style consistency.
To reduce logging defects.
To standardize logging prefixes.
To tee up conversions of:
	pr_<level>("%s: ...", ([truct netdevice *]foo)->name, ...)
to
	netdev_<level>(foo, "...", ...) 

[PATCH wireless-next 00/20] Use pr_<level>

[Ted Ts'o]

On Fri, Jun 15, 2012 at 03:48:39AM -0700, Joe Perches wrote:
> To tee up conversions of:
> 	pr_<level>("%s: ...", ([truct netdevice *]foo)->name, ...)
> to
> 	netdev_<level>(foo, "...", ...) 

If the goal is to do the latter, why introduce needless patch churn
now just to get to pr_<level>?  Having a standardized netdev_<label>()
adds real benefit that can be weighed against the cost of code churn.
Why not just wait until the netdev_<level> infrastructure can be
introduced?  It will save effort on everybody's part.

	     	     	  	    		- Ted

[PATCH wireless-next 00/20] Use pr_<level>

[Joe Perches]

On Fri, 2012-06-15 at 18:50 -0400, Ted Ts'o wrote:
> On Fri, Jun 15, 2012 at 03:48:39AM -0700, Joe Perches wrote:
> > To tee up conversions of:
> > 	pr_<level>("%s: ...", ([truct netdevice *]foo)->name, ...)
> > to
> > 	netdev_<level>(foo, "...", ...) 
> 
> If the goal is to do the latter, why introduce needless patch churn
> now just to get to pr_<level>?  Having a standardized netdev_<label>()
> adds real benefit that can be weighed against the cost of code churn.
> Why not just wait until the netdev_<level> infrastructure can be
> introduced?  It will save effort on everybody's part.

Not really.  This standardizes prefixes as is.

The newlines and such will still occur.
The git blame noise etc too.

The standardization via spatch will be
significantly easier this way.  It's also
a far easier pattern to verify.