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

From: Joe Perches
Date: Fri Jun 15 2012 - 01:59:25 EST


Use a more current logging style.

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

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/net/wireless/zd1211rw/zd_usb.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index af83c43..7acaa1d 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/firmware.h>
@@ -1551,29 +1553,28 @@ static int __init usb_init(void)
{
int r;

- pr_debug("%s usb_init()\n", driver.name);
+ pr_debug("usb_init()\n");

zd_workqueue = create_singlethread_workqueue(driver.name);
if (zd_workqueue == NULL) {
- printk(KERN_ERR "%s couldn't create workqueue\n", driver.name);
+ pr_err("couldn't create workqueue\n");
return -ENOMEM;
}

r = usb_register(&driver);
if (r) {
destroy_workqueue(zd_workqueue);
- printk(KERN_ERR "%s usb_register() failed. Error number %d\n",
- driver.name, r);
+ pr_err("usb_register() failed. Error number %d\n", r);
return r;
}

- pr_debug("%s initialized\n", driver.name);
+ pr_debug("initialized\n");
return 0;
}

static void __exit usb_exit(void)
{
- pr_debug("%s usb_exit()\n", driver.name);
+ pr_debug("usb_exit()\n");
usb_deregister(&driver);
destroy_workqueue(zd_workqueue);
}
--
1.7.8.111.gad25c.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/