Commit c6956c97 authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman

staging: usbip: stub_tx.c: coding style cleanup

Fix alignment for consistency, checkpatch.pl warnings for lines
over 80 characters, remove extraneous lines, and change conversion
specifier within a format string to remove warning.
Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64f338ed
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "usbip_common.h" #include "usbip_common.h"
#include "stub.h" #include "stub.h"
static void stub_free_priv_and_urb(struct stub_priv *priv) static void stub_free_priv_and_urb(struct stub_priv *priv)
{ {
struct urb *urb = priv->urb; struct urb *urb = priv->urb;
...@@ -71,7 +70,6 @@ void stub_complete(struct urb *urb) ...@@ -71,7 +70,6 @@ void stub_complete(struct urb *urb)
usbip_dbg_stub_tx("complete! status %d\n", urb->status); usbip_dbg_stub_tx("complete! status %d\n", urb->status);
switch (urb->status) { switch (urb->status) {
case 0: case 0:
/* OK */ /* OK */
...@@ -104,14 +102,12 @@ void stub_complete(struct urb *urb) ...@@ -104,14 +102,12 @@ void stub_complete(struct urb *urb)
} else } else
list_move_tail(&priv->list, &sdev->priv_tx); list_move_tail(&priv->list, &sdev->priv_tx);
spin_unlock_irqrestore(&sdev->priv_lock, flags); spin_unlock_irqrestore(&sdev->priv_lock, flags);
/* wake up tx_thread */ /* wake up tx_thread */
wake_up(&sdev->tx_waitq); wake_up(&sdev->tx_waitq);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* fill PDU */ /* fill PDU */
...@@ -130,7 +126,6 @@ static void setup_ret_submit_pdu(struct usbip_header *rpdu, struct urb *urb) ...@@ -130,7 +126,6 @@ static void setup_ret_submit_pdu(struct usbip_header *rpdu, struct urb *urb)
struct stub_priv *priv = (struct stub_priv *) urb->context; struct stub_priv *priv = (struct stub_priv *) urb->context;
setup_base_pdu(&rpdu->base, USBIP_RET_SUBMIT, priv->seqnum); setup_base_pdu(&rpdu->base, USBIP_RET_SUBMIT, priv->seqnum);
usbip_pack_pdu(rpdu, urb, USBIP_RET_SUBMIT, 1); usbip_pack_pdu(rpdu, urb, USBIP_RET_SUBMIT, 1);
} }
...@@ -138,11 +133,9 @@ static void setup_ret_unlink_pdu(struct usbip_header *rpdu, ...@@ -138,11 +133,9 @@ static void setup_ret_unlink_pdu(struct usbip_header *rpdu,
struct stub_unlink *unlink) struct stub_unlink *unlink)
{ {
setup_base_pdu(&rpdu->base, USBIP_RET_UNLINK, unlink->seqnum); setup_base_pdu(&rpdu->base, USBIP_RET_UNLINK, unlink->seqnum);
rpdu->u.ret_unlink.status = unlink->status; rpdu->u.ret_unlink.status = unlink->status;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* send RET_SUBMIT */ /* send RET_SUBMIT */
...@@ -232,18 +225,23 @@ static int stub_send_ret_submit(struct stub_device *sdev) ...@@ -232,18 +225,23 @@ static int stub_send_ret_submit(struct stub_device *sdev)
int i; int i;
for (i = 0; i < urb->number_of_packets; i++) { for (i = 0; i < urb->number_of_packets; i++) {
iov[iovnum].iov_base = urb->transfer_buffer + urb->iso_frame_desc[i].offset; iov[iovnum].iov_base = urb->transfer_buffer +
iov[iovnum].iov_len = urb->iso_frame_desc[i].actual_length; urb->iso_frame_desc[i].offset;
iov[iovnum].iov_len =
urb->iso_frame_desc[i].actual_length;
iovnum++; iovnum++;
txsize += urb->iso_frame_desc[i].actual_length; txsize += urb->iso_frame_desc[i].actual_length;
} }
if (txsize != sizeof(pdu_header) + urb->actual_length) { if (txsize != sizeof(pdu_header) + urb->actual_length) {
dev_err(&sdev->interface->dev, dev_err(&sdev->interface->dev,
"actual length of urb (%d) does not match iso packet sizes (%d)\n", "actual length of urb %d does not "
urb->actual_length, txsize-sizeof(pdu_header)); "match iso packet sizes %lu\n",
urb->actual_length,
txsize-sizeof(pdu_header));
kfree(iov); kfree(iov);
usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP); usbip_event_add(&sdev->ud,
SDEV_EVENT_ERROR_TCP);
return -1; return -1;
} }
} }
...@@ -285,17 +283,14 @@ static int stub_send_ret_submit(struct stub_device *sdev) ...@@ -285,17 +283,14 @@ static int stub_send_ret_submit(struct stub_device *sdev)
} }
spin_lock_irqsave(&sdev->priv_lock, flags); spin_lock_irqsave(&sdev->priv_lock, flags);
list_for_each_entry_safe(priv, tmp, &sdev->priv_free, list) { list_for_each_entry_safe(priv, tmp, &sdev->priv_free, list) {
stub_free_priv_and_urb(priv); stub_free_priv_and_urb(priv);
} }
spin_unlock_irqrestore(&sdev->priv_lock, flags); spin_unlock_irqrestore(&sdev->priv_lock, flags);
return total_size; return total_size;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* send RET_UNLINK */ /* send RET_UNLINK */
...@@ -317,7 +312,6 @@ static struct stub_unlink *dequeue_from_unlink_tx(struct stub_device *sdev) ...@@ -317,7 +312,6 @@ static struct stub_unlink *dequeue_from_unlink_tx(struct stub_device *sdev)
return NULL; return NULL;
} }
static int stub_send_ret_unlink(struct stub_device *sdev) static int stub_send_ret_unlink(struct stub_device *sdev)
{ {
unsigned long flags; unsigned long flags;
...@@ -358,13 +352,10 @@ static int stub_send_ret_unlink(struct stub_device *sdev) ...@@ -358,13 +352,10 @@ static int stub_send_ret_unlink(struct stub_device *sdev)
return -1; return -1;
} }
usbip_dbg_stub_tx("send txdata\n"); usbip_dbg_stub_tx("send txdata\n");
total_size += txsize; total_size += txsize;
} }
spin_lock_irqsave(&sdev->priv_lock, flags); spin_lock_irqsave(&sdev->priv_lock, flags);
list_for_each_entry_safe(unlink, tmp, &sdev->unlink_free, list) { list_for_each_entry_safe(unlink, tmp, &sdev->unlink_free, list) {
...@@ -377,7 +368,6 @@ static int stub_send_ret_unlink(struct stub_device *sdev) ...@@ -377,7 +368,6 @@ static int stub_send_ret_unlink(struct stub_device *sdev)
return total_size; return total_size;
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
int stub_tx_loop(void *data) int stub_tx_loop(void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment