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/vhci_sysfs.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/vhci_sysfs.c')
| -rw-r--r-- | drivers/staging/usbip/vhci_sysfs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index a684f225844d..68c7f0aae6e7 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/drivers/staging/usbip/vhci_sysfs.c @@ -89,7 +89,7 @@ static int vhci_port_disconnect(__u32 rhport) spin_lock(&vdev->ud.lock); if (vdev->ud.status == VDEV_ST_NULL) { - usbip_uerr("not connected %d\n", vdev->ud.status); + pr_err("not connected %d\n", vdev->ud.status); /* unlock */ spin_unlock(&vdev->ud.lock); @@ -117,7 +117,7 @@ static ssize_t store_detach(struct device *dev, struct device_attribute *attr, /* check rhport */ if (rhport >= VHCI_NPORTS) { - usbip_uerr("invalid port %u\n", rhport); + dev_err(dev, "invalid port %u\n", rhport); return -EINVAL; } @@ -136,7 +136,7 @@ static int valid_args(__u32 rhport, enum usb_device_speed speed) { /* check rhport */ if ((rhport < 0) || (rhport >= VHCI_NPORTS)) { - usbip_uerr("port %u\n", rhport); + pr_err("port %u\n", rhport); return -EINVAL; } @@ -148,7 +148,7 @@ static int valid_args(__u32 rhport, enum usb_device_speed speed) case USB_SPEED_WIRELESS: break; default: - usbip_uerr("speed %d\n", speed); + pr_err("speed %d\n", speed); return -EINVAL; } @@ -206,12 +206,12 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, spin_unlock(&vdev->ud.lock); spin_unlock(&the_controller->lock); - usbip_uerr("port %d already used\n", rhport); + dev_err(dev, "port %d already used\n", rhport); return -EINVAL; } - usbip_uinfo("rhport(%u) sockfd(%d) devid(%u) speed(%u)\n", - rhport, sockfd, devid, speed); + dev_info(dev, "rhport(%u) sockfd(%d) devid(%u) speed(%u)\n", + rhport, sockfd, devid, speed); vdev->devid = devid; vdev->speed = speed; |