diff options
| author | matt mooney <mfm@muteddisk.com> | 2011-05-19 16:47:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:57:30 -0700 |
| commit | 1a4b6f66285785ddccef049e6b45be4e7c7a2189 (patch) | |
| tree | fe745a2467162a9ab23ca37ce7872532a69f136d /drivers/staging/usbip/stub_main.c | |
| parent | db60697a086cdf4bbe6deedcefc2ff81e2a9efd2 (diff) | |
staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
This switches all of the usbip_u{dbg,err,info} and printk statements to
dev_<level>, if possible, or pr_<level> macros. And removes a few
unnecessary debug statements.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip/stub_main.c')
| -rw-r--r-- | drivers/staging/usbip/stub_main.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index 5568110c2be..e9085d66394 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -178,14 +178,14 @@ static ssize_t store_match_busid(struct device_driver *dev, const char *buf, if (add_match_busid(busid) < 0) return -ENOMEM; else { - usbip_udbg("add busid %s\n", busid); + pr_debug("add busid %s\n", busid); return count; } } else if (!strncmp(buf, "del ", 4)) { if (del_match_busid(busid) < 0) return -ENODEV; else { - usbip_udbg("del busid %s\n", busid); + pr_debug("del busid %s\n", busid); return count; } } else @@ -239,12 +239,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev) { struct stub_priv *priv; - usbip_udbg("free sdev %p\n", sdev); + dev_dbg(&sdev->udev->dev, "free sdev %p\n", sdev); while ((priv = stub_priv_pop(sdev))) { struct urb *urb = priv->urb; - usbip_udbg(" free urb %p\n", urb); + dev_dbg(&sdev->udev->dev, "free urb %p\n", urb); usb_kill_urb(urb); kmem_cache_free(stub_priv_cache, priv); @@ -265,20 +265,17 @@ static int __init usb_stub_init(void) SLAB_HWCACHE_ALIGN, NULL); if (!stub_priv_cache) { - printk(KERN_ERR KBUILD_MODNAME - ": create stub_priv_cache error\n"); + pr_err("create stub_priv_cache error\n"); return -ENOMEM; } ret = usb_register(&stub_driver); if (ret) { - printk(KERN_ERR KBUILD_MODNAME ": usb_register failed %d\n", - ret); + pr_err("usb_register failed %d\n", ret); goto error_usb_register; } - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC " " USBIP_VERSION - "\n"); + pr_info(DRIVER_DESC " " USBIP_VERSION "\n"); init_busid_table(); @@ -286,7 +283,7 @@ static int __init usb_stub_init(void) &driver_attr_match_busid); if (ret) { - printk(KERN_ERR KBUILD_MODNAME ": create driver sysfs\n"); + pr_err("create driver sysfs\n"); goto error_create_file; } |