diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-18 06:36:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-18 16:06:23 -0700 |
| commit | 3d582487beb83d650fbd25cb65688b0fbedc97f1 (patch) | |
| tree | b6f0fd8bef498a45b1bb2da074fbe948cc50d272 | |
| parent | 421ce4e58e98fbd9eacc5ad95fc2fb3b2b92858a (diff) | |
staging: vt6656: struct vnt_private pInterruptURB rename to interrupt_urb
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 14 | ||||
| -rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 8257a641f474..22554af3ae36 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -284,7 +284,7 @@ struct vnt_private { unsigned long Flags; /* USB */ - struct urb *pInterruptURB; + struct urb *interrupt_urb; u32 int_interval; /* Variables to track resources for the BULK In Pipe */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index be498bca13d6..fe2f0bcd4c06 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -517,8 +517,8 @@ static bool device_alloc_bufs(struct vnt_private *priv) goto free_rx_tx; } - priv->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); - if (priv->pInterruptURB == NULL) { + priv->interrupt_urb = usb_alloc_urb(0, GFP_ATOMIC); + if (priv->interrupt_urb == NULL) { dev_err(&priv->usb->dev, "Failed to alloc int urb\n"); goto free_rx_tx; } @@ -526,7 +526,7 @@ static bool device_alloc_bufs(struct vnt_private *priv) priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL); if (priv->int_buf.data_buf == NULL) { dev_err(&priv->usb->dev, "Failed to alloc int buf\n"); - usb_free_urb(priv->pInterruptURB); + usb_free_urb(priv->interrupt_urb); goto free_rx_tx; } @@ -590,8 +590,8 @@ free_all: device_free_tx_bufs(priv); device_free_int_bufs(priv); - usb_kill_urb(priv->pInterruptURB); - usb_free_urb(priv->pInterruptURB); + usb_kill_urb(priv->interrupt_urb); + usb_free_urb(priv->interrupt_urb); return -ENOMEM; } @@ -629,8 +629,8 @@ static void vnt_stop(struct ieee80211_hw *hw) device_free_rx_bufs(priv); device_free_int_bufs(priv); - usb_kill_urb(priv->pInterruptURB); - usb_free_urb(priv->pInterruptURB); + usb_kill_urb(priv->interrupt_urb); + usb_free_urb(priv->interrupt_urb); return; } diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 126294d1f1bb..9a8874917f8d 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -126,7 +126,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv) priv->int_buf.in_use = true; - usb_fill_int_urb(priv->pInterruptURB, + usb_fill_int_urb(priv->interrupt_urb, priv->usb, usb_rcvintpipe(priv->usb, 1), priv->int_buf.data_buf, @@ -135,7 +135,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv) priv, priv->int_interval); - status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC); + status = usb_submit_urb(priv->interrupt_urb, GFP_ATOMIC); if (status) { dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status); priv->int_buf.in_use = false; @@ -172,7 +172,7 @@ static void vnt_start_interrupt_urb_complete(struct urb *urb) vnt_int_process_data(priv); } - status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC); + status = usb_submit_urb(priv->interrupt_urb, GFP_ATOMIC); if (status) { dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status); } else { |