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_rx.c | |
| parent | db60697a086cdf4bbe6deedcefc2ff81e2a9efd2 (diff) | |
| download | op-kernel-dev-1a4b6f66285785ddccef049e6b45be4e7c7a2189.zip op-kernel-dev-1a4b6f66285785ddccef049e6b45be4e7c7a2189.tar.gz | |
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_rx.c')
| -rw-r--r-- | drivers/staging/usbip/stub_rx.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index e245609..a5c1fa1 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -102,11 +102,11 @@ static int tweak_clear_halt_cmd(struct urb *urb) ret = usb_clear_halt(urb->dev, target_pipe); if (ret < 0) - usbip_uinfo("clear_halt error: devnum %d endp %d, %d\n", - urb->dev->devnum, target_endp, ret); + dev_err(&urb->dev->dev, "usb_clear_halt error: devnum %d endp " + "%d ret %d\n", urb->dev->devnum, target_endp, ret); else - usbip_uinfo("clear_halt done: devnum %d endp %d\n", - urb->dev->devnum, target_endp); + dev_info(&urb->dev->dev, "usb_clear_halt done: devnum %d endp " + "%d\n", urb->dev->devnum, target_endp); return ret; } @@ -127,11 +127,11 @@ static int tweak_set_interface_cmd(struct urb *urb) ret = usb_set_interface(urb->dev, interface, alternate); if (ret < 0) - usbip_uinfo("set_interface error: inf %u alt %u, %d\n", - interface, alternate, ret); + dev_err(&urb->dev->dev, "usb_set_interface error: inf %u alt " + "%u ret %d\n", interface, alternate, ret); else - usbip_uinfo("set_interface done: inf %u alt %u\n", - interface, alternate); + dev_info(&urb->dev->dev, "usb_set_interface done: inf %u alt " + "%u\n", interface, alternate); return ret; } @@ -160,9 +160,8 @@ static int tweak_set_configuration_cmd(struct urb *urb) * A user may need to set a special configuration value before * exporting the device. */ - usbip_uinfo("set_configuration %d to %s\n", - config, dev_name(&urb->dev->dev)); - usbip_uinfo("but, skip!\n"); + dev_info(&urb->dev->dev, "usb_set_configuration %d to %s... skip!\n", + config, dev_name(&urb->dev->dev)); return 0; /* return usb_driver_set_configuration(urb->dev, config); */ @@ -173,7 +172,7 @@ static int tweak_reset_device_cmd(struct urb *urb) struct stub_priv *priv = (struct stub_priv *) urb->context; struct stub_device *sdev = priv->sdev; - usbip_uinfo("reset_device %s\n", dev_name(&urb->dev->dev)); + dev_info(&urb->dev->dev, "usb_queue_reset_device\n"); /* * usb_lock_device_for_reset caused a deadlock: it causes the driver |
