aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Cabessa <ced@ryick.net>2014-03-19 18:04:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-19 21:50:16 -0400
commit6bb3ee69572539d1fd89c6408e11f5476cfb23e2 (patch)
treee727e29baba429b39481c2b4ce11d252b608455c
parent22ad57ba5eacf2611a086379aaa18e456bf2ffbc (diff)
staging: usbip: fix quoted string split across lines
Signed-off-by: Cédric Cabessa <ced@ryick.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/usbip/stub_tx.c16
-rw-r--r--drivers/staging/usbip/usbip_common.c10
-rw-r--r--drivers/staging/usbip/vhci_sysfs.c4
3 files changed, 14 insertions, 16 deletions
diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c
index cd5326ae38cc..1622563823a3 100644
--- a/drivers/staging/usbip/stub_tx.c
+++ b/drivers/staging/usbip/stub_tx.c
@@ -74,12 +74,12 @@ void stub_complete(struct urb *urb)
74 /* OK */ 74 /* OK */
75 break; 75 break;
76 case -ENOENT: 76 case -ENOENT:
77 dev_info(&urb->dev->dev, "stopped by a call to usb_kill_urb() " 77 dev_info(&urb->dev->dev,
78 "because of cleaning up a virtual connection\n"); 78 "stopped by a call to usb_kill_urb() because of cleaning up a virtual connection\n");
79 return; 79 return;
80 case -ECONNRESET: 80 case -ECONNRESET:
81 dev_info(&urb->dev->dev, "unlinked by a call to " 81 dev_info(&urb->dev->dev,
82 "usb_unlink_urb()\n"); 82 "unlinked by a call to usb_unlink_urb()\n");
83 break; 83 break;
84 case -EPIPE: 84 case -EPIPE:
85 dev_info(&urb->dev->dev, "endpoint %d is stalled\n", 85 dev_info(&urb->dev->dev, "endpoint %d is stalled\n",
@@ -89,8 +89,9 @@ void stub_complete(struct urb *urb)
89 dev_info(&urb->dev->dev, "device removed?\n"); 89 dev_info(&urb->dev->dev, "device removed?\n");
90 break; 90 break;
91 default: 91 default:
92 dev_info(&urb->dev->dev, "urb completion with non-zero status " 92 dev_info(&urb->dev->dev,
93 "%d\n", urb->status); 93 "urb completion with non-zero status %d\n",
94 urb->status);
94 break; 95 break;
95 } 96 }
96 97
@@ -228,8 +229,7 @@ static int stub_send_ret_submit(struct stub_device *sdev)
228 229
229 if (txsize != sizeof(pdu_header) + urb->actual_length) { 230 if (txsize != sizeof(pdu_header) + urb->actual_length) {
230 dev_err(&sdev->interface->dev, 231 dev_err(&sdev->interface->dev,
231 "actual length of urb %d does not " 232 "actual length of urb %d does not match iso packet sizes %zu\n",
232 "match iso packet sizes %zu\n",
233 urb->actual_length, 233 urb->actual_length,
234 txsize-sizeof(pdu_header)); 234 txsize-sizeof(pdu_header));
235 kfree(iov); 235 kfree(iov);
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 2a11233d44f8..184fa70365db 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -178,8 +178,8 @@ static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd)
178 } 178 }
179 179
180 pr_debug(" "); 180 pr_debug(" ");
181 pr_debug("bRequestType(%02X) bRequest(%02X) wValue(%04X) wIndex(%04X) " 181 pr_debug("bRequestType(%02X) bRequest(%02X) wValue(%04X) wIndex(%04X) wLength(%04X) ",
182 "wLength(%04X) ", cmd->bRequestType, cmd->bRequest, 182 cmd->bRequestType, cmd->bRequest,
183 cmd->wValue, cmd->wIndex, cmd->wLength); 183 cmd->wValue, cmd->wIndex, cmd->wLength);
184 pr_debug("\n "); 184 pr_debug("\n ");
185 185
@@ -290,8 +290,7 @@ void usbip_dump_header(struct usbip_header *pdu)
290 290
291 switch (pdu->base.command) { 291 switch (pdu->base.command) {
292 case USBIP_CMD_SUBMIT: 292 case USBIP_CMD_SUBMIT:
293 pr_debug("USBIP_CMD_SUBMIT: " 293 pr_debug("USBIP_CMD_SUBMIT: x_flags %u x_len %u sf %u #p %d iv %d\n",
294 "x_flags %u x_len %u sf %u #p %d iv %d\n",
295 pdu->u.cmd_submit.transfer_flags, 294 pdu->u.cmd_submit.transfer_flags,
296 pdu->u.cmd_submit.transfer_buffer_length, 295 pdu->u.cmd_submit.transfer_buffer_length,
297 pdu->u.cmd_submit.start_frame, 296 pdu->u.cmd_submit.start_frame,
@@ -688,8 +687,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
688 687
689 if (total_length != urb->actual_length) { 688 if (total_length != urb->actual_length) {
690 dev_err(&urb->dev->dev, 689 dev_err(&urb->dev->dev,
691 "total length of iso packets %d not equal to actual " 690 "total length of iso packets %d not equal to actual length of buffer %d\n",
692 "length of buffer %d\n",
693 total_length, urb->actual_length); 691 total_length, urb->actual_length);
694 692
695 if (ud->side == USBIP_STUB) 693 if (ud->side == USBIP_STUB)
diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c
index 82dd49f7df9e..e0980324fb03 100644
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/staging/usbip/vhci_sysfs.c
@@ -47,8 +47,8 @@ static ssize_t status_show(struct device *dev, struct device_attribute *attr,
47 * up /proc/net/{tcp,tcp6}. Also, a userland program may remember a 47 * up /proc/net/{tcp,tcp6}. Also, a userland program may remember a
48 * port number and its peer IP address. 48 * port number and its peer IP address.
49 */ 49 */
50 out += sprintf(out, "prt sta spd bus dev socket " 50 out += sprintf(out,
51 "local_busid\n"); 51 "prt sta spd bus dev socket local_busid\n");
52 52
53 for (i = 0; i < VHCI_NPORTS; i++) { 53 for (i = 0; i < VHCI_NPORTS; i++) {
54 struct vhci_device *vdev = port_to_vdev(i); 54 struct vhci_device *vdev = port_to_vdev(i);