[PATCH 47/49] drivers/staging/vt6656: Convert printks to pr_<level>
Joe Perches
joe at perches.com
Wed Oct 14 18:54:31 PDT 2009
Signed-off-by: Joe Perches <joe at perches.com>
---
drivers/staging/vt6656/device_cfg.h | 4 ++--
drivers/staging/vt6656/main_usb.c | 22 +++++++++++++---------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/vt6656/device_cfg.h b/drivers/staging/vt6656/device_cfg.h
index c816901..ead6984 100644
--- a/drivers/staging/vt6656/device_cfg.h
+++ b/drivers/staging/vt6656/device_cfg.h
@@ -92,8 +92,8 @@ typedef enum _chip_type{
#ifdef VIAWET_DEBUG
#define ASSERT(x) { \
if (!(x)) { \
- printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x,\
- __FUNCTION__, __LINE__);\
+ pr_err("assertion %s failed: file %s line %d\n", #x, \
+ __FUNCTION__, __LINE__); \
*(int*) 0=0;\
}\
}
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 7f96bca..f5b6a9d 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -44,6 +44,9 @@
*
* Revision History:
*/
+
+#define pr_fmt(fmt) "vt6656: " fmt
+
#undef __NO_VERSION__
#include "device.h"
@@ -767,16 +770,16 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
PSDevice pDevice = NULL;
- printk(KERN_NOTICE "%s Ver. %s\n",DEVICE_FULL_DRV_NAM, DEVICE_VERSION);
- printk(KERN_NOTICE "Copyright (c) 2004 VIA Networking Technologies, Inc.\n");
+ pr_notice("%s Ver. %s\n",DEVICE_FULL_DRV_NAM, DEVICE_VERSION);
+ pr_notice("Copyright (c) 2004 VIA Networking Technologies, Inc.\n");
udev = usb_get_dev(udev);
netdev = alloc_etherdev(sizeof(DEVICE_INFO));
if (netdev == NULL) {
- printk(KERN_ERR DEVICE_NAME ": allocate net device failed \n");
- kfree(pDevice);
+ pr_err("allocate net device failed \n");
+ kfree(pDevice);
goto err_nomem;
}
@@ -804,10 +807,10 @@ vntwusb_found1(struct usb_interface *intf, const struct usb_device_id *id)
memcpy(pDevice->dev->dev_addr, fake_mac, U_ETHER_ADDR_LEN); //use fake mac address
rc = register_netdev(netdev);
if (rc != 0) {
- printk(KERN_ERR DEVICE_NAME " Failed to register netdev\n");
- free_netdev(netdev);
- kfree(pDevice);
- return -ENODEV;
+ pr_err("Failed to register netdev\n");
+ free_netdev(netdev);
+ kfree(pDevice);
+ return -ENODEV;
}
//2008-0623-02<Remark>by MikeLiu
//2007-0821-01<Add>by MikeLiu
@@ -2166,6 +2169,7 @@ static int ethtool_ioctl(struct net_device *dev, void *useraddr)
MODULE_DEVICE_TABLE(usb, vntwusb_table);
+
static struct usb_driver vntwusb_driver = {
.name = DEVICE_NAME,
.probe = vntwusb_found1,
@@ -2182,7 +2186,7 @@ static struct usb_driver vntwusb_driver = {
static int __init vntwusb_init_module(void)
{
- printk(KERN_NOTICE DEVICE_FULL_DRV_NAM " " DEVICE_VERSION);
+ pr_notice(DEVICE_FULL_DRV_NAM " " DEVICE_VERSION);
return usb_register(&vntwusb_driver);
}
--
1.6.5.rc3.dirty
More information about the devel
mailing list