From 325de98424fd5f6bf7e12f598dc1c54b4595a760 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 18 Jul 2014 06:36:11 +0100 Subject: [PATCH] staging: vt6656: struct vnt_rcb remove camel case Camel case changes pDevice -> priv pUrb -> urb bBoolInUse -> in_use Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 6 +++--- drivers/staging/vt6656/main_usb.c | 14 +++++++------- drivers/staging/vt6656/usbpipe.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index ad43c6f931c2..8f318a9d8ba7 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -219,10 +219,10 @@ enum { /* RCB (Receive Control Block) */ struct vnt_rcb { - void *pDevice; - struct urb *pUrb; + void *priv; + struct urb *urb; struct sk_buff *skb; - int bBoolInUse; + int in_use; }; /* used to track bulk out irps */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 06e4861123e2..be498bca13d6 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -423,9 +423,9 @@ static void device_free_rx_bufs(struct vnt_private *priv) continue; /* deallocate URBs */ - if (rcb->pUrb) { - usb_kill_urb(rcb->pUrb); - usb_free_urb(rcb->pUrb); + if (rcb->urb) { + usb_kill_urb(rcb->urb); + usb_free_urb(rcb->urb); } /* deallocate skb */ @@ -495,11 +495,11 @@ static bool device_alloc_bufs(struct vnt_private *priv) rcb = priv->apRCB[ii]; - rcb->pDevice = priv; + rcb->priv = priv; /* allocate URBs */ - rcb->pUrb = usb_alloc_urb(0, GFP_ATOMIC); - if (rcb->pUrb == NULL) { + rcb->urb = usb_alloc_urb(0, GFP_ATOMIC); + if (rcb->urb == NULL) { dev_err(&priv->usb->dev, "Failed to alloc rx urb\n"); goto free_rx_tx; } @@ -510,7 +510,7 @@ static bool device_alloc_bufs(struct vnt_private *priv) goto free_rx_tx; } - rcb->bBoolInUse = false; + rcb->in_use = false; /* submit rx urb */ if (vnt_submit_rx_urb(priv, rcb)) diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index d994b1b093ab..126294d1f1bb 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -187,7 +187,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) int status = 0; struct urb *urb; - urb = rcb->pUrb; + urb = rcb->urb; if (rcb->skb == NULL) { dev_dbg(&priv->usb->dev, "rcb->skb is null\n"); return status; @@ -207,7 +207,7 @@ int vnt_submit_rx_urb(struct vnt_private *priv, struct vnt_rcb *rcb) return STATUS_FAILURE ; } - rcb->bBoolInUse = true; + rcb->in_use = true; return status; } @@ -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) { struct vnt_rcb *rcb = urb->context; - struct vnt_private *priv = rcb->pDevice; + struct vnt_private *priv = rcb->priv; unsigned long flags; switch (urb->status) { @@ -240,7 +240,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb) dev_dbg(&priv->usb->dev, "Failed to re-alloc rx skb\n"); - rcb->bBoolInUse = false; + rcb->in_use = false; spin_unlock_irqrestore(&priv->lock, flags); return; } @@ -258,7 +258,7 @@ static void vnt_submit_rx_urb_complete(struct urb *urb) if (usb_submit_urb(urb, GFP_ATOMIC)) { dev_dbg(&priv->usb->dev, "Failed to re submit rx skb\n"); - rcb->bBoolInUse = false; + rcb->in_use = false; } return; -- 2.39.5