Commit 325de984 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: struct vnt_rcb remove camel case

Camel case changes
pDevice -> priv
pUrb -> urb
bBoolInUse -> in_use
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23dbf877
...@@ -219,10 +219,10 @@ enum { ...@@ -219,10 +219,10 @@ enum {
/* RCB (Receive Control Block) */ /* RCB (Receive Control Block) */
struct vnt_rcb { struct vnt_rcb {
void *pDevice; void *priv;
struct urb *pUrb; struct urb *urb;
struct sk_buff *skb; struct sk_buff *skb;
int bBoolInUse; int in_use;
}; };
/* used to track bulk out irps */ /* used to track bulk out irps */
......
...@@ -423,9 +423,9 @@ static void device_free_rx_bufs(struct vnt_private *priv) ...@@ -423,9 +423,9 @@ static void device_free_rx_bufs(struct vnt_private *priv)
continue; continue;
/* deallocate URBs */ /* deallocate URBs */
if (rcb->pUrb) { if (rcb->urb) {
usb_kill_urb(rcb->pUrb); usb_kill_urb(rcb->urb);
usb_free_urb(rcb->pUrb); usb_free_urb(rcb->urb);
} }
/* deallocate skb */ /* deallocate skb */
...@@ -495,11 +495,11 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -495,11 +495,11 @@ static bool device_alloc_bufs(struct vnt_private *priv)
rcb = priv->apRCB[ii]; rcb = priv->apRCB[ii];
rcb->pDevice = priv; rcb->priv = priv;
/* allocate URBs */ /* allocate URBs */
rcb->pUrb = usb_alloc_urb(0, GFP_ATOMIC); rcb->urb = usb_alloc_urb(0, GFP_ATOMIC);
if (rcb->pUrb == NULL) { if (rcb->urb == NULL) {
dev_err(&priv->usb->dev, "Failed to alloc rx urb\n"); dev_err(&priv->usb->dev, "Failed to alloc rx urb\n");
goto free_rx_tx; goto free_rx_tx;
} }
...@@ -510,7 +510,7 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -510,7 +510,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
goto free_rx_tx; goto free_rx_tx;
} }
rcb->bBoolInUse = false; rcb->in_use = false;
/* submit rx urb */ /* submit rx urb */
if (vnt_submit_rx_urb(priv, rcb)) if (vnt_submit_rx_urb(priv, rcb))
......
...@@ -187,7 +187,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) ...@@ -187,7 +187,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
int status = 0; int status = 0;
struct urb *urb; struct urb *urb;
urb = rcb->pUrb; urb = rcb->urb;
if (rcb->skb == NULL) { if (rcb->skb == NULL) {
dev_dbg(&priv->usb->dev, "rcb->skb is null\n"); dev_dbg(&priv->usb->dev, "rcb->skb is null\n");
return status; return status;
...@@ -207,7 +207,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) ...@@ -207,7 +207,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
return STATUS_FAILURE ; return STATUS_FAILURE ;
} }
rcb->bBoolInUse = true; rcb->in_use = true;
return status; return status;
} }
...@@ -215,7 +215,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) ...@@ -215,7 +215,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb)
static void vnt_submit_rx_urb_complete(struct urb *urb) static void vnt_submit_rx_urb_complete(struct urb *urb)
{ {
struct vnt_rcb *rcb = urb->context; struct vnt_rcb *rcb = urb->context;
struct vnt_private *priv = rcb->pDevice; struct vnt_private *priv = rcb->priv;
unsigned long flags; unsigned long flags;
switch (urb->status) { switch (urb->status) {
...@@ -240,7 +240,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb) ...@@ -240,7 +240,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
dev_dbg(&priv->usb->dev, dev_dbg(&priv->usb->dev,
"Failed to re-alloc rx skb\n"); "Failed to re-alloc rx skb\n");
rcb->bBoolInUse = false; rcb->in_use = false;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return; return;
} }
...@@ -258,7 +258,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb) ...@@ -258,7 +258,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb)
if (usb_submit_urb(urb, GFP_ATOMIC)) { if (usb_submit_urb(urb, GFP_ATOMIC)) {
dev_dbg(&priv->usb->dev, "Failed to re submit rx skb\n"); dev_dbg(&priv->usb->dev, "Failed to re submit rx skb\n");
rcb->bBoolInUse = false; rcb->in_use = false;
} }
return; return;
......
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