diff options
Diffstat (limited to 'drivers/usb/usbip/usbip_common.c')
-rw-r--r-- | drivers/usb/usbip/usbip_common.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c index e40da7759a0e..1838f1b2c2fa 100644 --- a/drivers/usb/usbip/usbip_common.c +++ b/drivers/usb/usbip/usbip_common.c | |||
@@ -103,7 +103,7 @@ static void usbip_dump_usb_device(struct usb_device *udev) | |||
103 | dev_dbg(dev, " devnum(%d) devpath(%s) usb speed(%s)", | 103 | dev_dbg(dev, " devnum(%d) devpath(%s) usb speed(%s)", |
104 | udev->devnum, udev->devpath, usb_speed_string(udev->speed)); | 104 | udev->devnum, udev->devpath, usb_speed_string(udev->speed)); |
105 | 105 | ||
106 | pr_debug("tt %p, ttport %d\n", udev->tt, udev->ttport); | 106 | pr_debug("tt hub ttport %d\n", udev->ttport); |
107 | 107 | ||
108 | dev_dbg(dev, " "); | 108 | dev_dbg(dev, " "); |
109 | for (i = 0; i < 16; i++) | 109 | for (i = 0; i < 16; i++) |
@@ -136,12 +136,8 @@ static void usbip_dump_usb_device(struct usb_device *udev) | |||
136 | } | 136 | } |
137 | pr_debug("\n"); | 137 | pr_debug("\n"); |
138 | 138 | ||
139 | dev_dbg(dev, "parent %p, bus %p\n", udev->parent, udev->bus); | 139 | dev_dbg(dev, "parent %s, bus %s\n", dev_name(&udev->parent->dev), |
140 | 140 | udev->bus->bus_name); | |
141 | dev_dbg(dev, | ||
142 | "descriptor %p, config %p, actconfig %p, rawdescriptors %p\n", | ||
143 | &udev->descriptor, udev->config, | ||
144 | udev->actconfig, udev->rawdescriptors); | ||
145 | 141 | ||
146 | dev_dbg(dev, "have_langid %d, string_langid %d\n", | 142 | dev_dbg(dev, "have_langid %d, string_langid %d\n", |
147 | udev->have_langid, udev->string_langid); | 143 | udev->have_langid, udev->string_langid); |
@@ -249,9 +245,6 @@ void usbip_dump_urb(struct urb *urb) | |||
249 | 245 | ||
250 | dev = &urb->dev->dev; | 246 | dev = &urb->dev->dev; |
251 | 247 | ||
252 | dev_dbg(dev, " urb :%p\n", urb); | ||
253 | dev_dbg(dev, " dev :%p\n", urb->dev); | ||
254 | |||
255 | usbip_dump_usb_device(urb->dev); | 248 | usbip_dump_usb_device(urb->dev); |
256 | 249 | ||
257 | dev_dbg(dev, " pipe :%08x ", urb->pipe); | 250 | dev_dbg(dev, " pipe :%08x ", urb->pipe); |
@@ -260,11 +253,9 @@ void usbip_dump_urb(struct urb *urb) | |||
260 | 253 | ||
261 | dev_dbg(dev, " status :%d\n", urb->status); | 254 | dev_dbg(dev, " status :%d\n", urb->status); |
262 | dev_dbg(dev, " transfer_flags :%08X\n", urb->transfer_flags); | 255 | dev_dbg(dev, " transfer_flags :%08X\n", urb->transfer_flags); |
263 | dev_dbg(dev, " transfer_buffer :%p\n", urb->transfer_buffer); | ||
264 | dev_dbg(dev, " transfer_buffer_length:%d\n", | 256 | dev_dbg(dev, " transfer_buffer_length:%d\n", |
265 | urb->transfer_buffer_length); | 257 | urb->transfer_buffer_length); |
266 | dev_dbg(dev, " actual_length :%d\n", urb->actual_length); | 258 | dev_dbg(dev, " actual_length :%d\n", urb->actual_length); |
267 | dev_dbg(dev, " setup_packet :%p\n", urb->setup_packet); | ||
268 | 259 | ||
269 | if (urb->setup_packet && usb_pipetype(urb->pipe) == PIPE_CONTROL) | 260 | if (urb->setup_packet && usb_pipetype(urb->pipe) == PIPE_CONTROL) |
270 | usbip_dump_usb_ctrlrequest( | 261 | usbip_dump_usb_ctrlrequest( |
@@ -274,8 +265,6 @@ void usbip_dump_urb(struct urb *urb) | |||
274 | dev_dbg(dev, " number_of_packets :%d\n", urb->number_of_packets); | 265 | dev_dbg(dev, " number_of_packets :%d\n", urb->number_of_packets); |
275 | dev_dbg(dev, " interval :%d\n", urb->interval); | 266 | dev_dbg(dev, " interval :%d\n", urb->interval); |
276 | dev_dbg(dev, " error_count :%d\n", urb->error_count); | 267 | dev_dbg(dev, " error_count :%d\n", urb->error_count); |
277 | dev_dbg(dev, " context :%p\n", urb->context); | ||
278 | dev_dbg(dev, " complete :%p\n", urb->complete); | ||
279 | } | 268 | } |
280 | EXPORT_SYMBOL_GPL(usbip_dump_urb); | 269 | EXPORT_SYMBOL_GPL(usbip_dump_urb); |
281 | 270 | ||
@@ -328,18 +317,14 @@ int usbip_recv(struct socket *sock, void *buf, int size) | |||
328 | struct msghdr msg; | 317 | struct msghdr msg; |
329 | struct kvec iov; | 318 | struct kvec iov; |
330 | int total = 0; | 319 | int total = 0; |
331 | |||
332 | /* for blocks of if (usbip_dbg_flag_xmit) */ | 320 | /* for blocks of if (usbip_dbg_flag_xmit) */ |
333 | char *bp = buf; | 321 | char *bp = buf; |
334 | int osize = size; | 322 | int osize = size; |
335 | 323 | ||
336 | usbip_dbg_xmit("enter\n"); | 324 | if (!sock || !buf || !size) |
337 | |||
338 | if (!sock || !buf || !size) { | ||
339 | pr_err("invalid arg, sock %p buff %p size %d\n", sock, buf, | ||
340 | size); | ||
341 | return -EINVAL; | 325 | return -EINVAL; |
342 | } | 326 | |
327 | usbip_dbg_xmit("enter\n"); | ||
343 | 328 | ||
344 | do { | 329 | do { |
345 | sock->sk->sk_allocation = GFP_NOIO; | 330 | sock->sk->sk_allocation = GFP_NOIO; |
@@ -352,11 +337,8 @@ int usbip_recv(struct socket *sock, void *buf, int size) | |||
352 | msg.msg_flags = MSG_NOSIGNAL; | 337 | msg.msg_flags = MSG_NOSIGNAL; |
353 | 338 | ||
354 | result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL); | 339 | result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL); |
355 | if (result <= 0) { | 340 | if (result <= 0) |
356 | pr_debug("receive sock %p buf %p size %u ret %d total %d\n", | ||
357 | sock, buf, size, result, total); | ||
358 | goto err; | 341 | goto err; |
359 | } | ||
360 | 342 | ||
361 | size -= result; | 343 | size -= result; |
362 | buf += result; | 344 | buf += result; |