leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: struct vnt_private pInterruptURB rename to interrupt_urb

Browse Source 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-07-18 06:36:14 +01:00 committed by Greg Kroah-Hartman
parent 421ce4e58e
commit 3d582487be
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6656/device.h
View File

@ -284,7 +284,7 @@ struct vnt_private {
unsigned long Flags; unsigned long Flags;
/* USB */ /* USB */
struct urb *pInterruptURB; struct urb *interrupt_urb;
u32 int_interval; u32 int_interval;
/* Variables to track resources for the BULK In Pipe */ /* Variables to track resources for the BULK In Pipe */

14
drivers/staging/vt6656/main_usb.c
View File

@ -517,8 +517,8 @@ static bool device_alloc_bufs(struct vnt_private *priv)
goto free_rx_tx; goto free_rx_tx;
} }
priv->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); priv->interrupt_urb = usb_alloc_urb(0, GFP_ATOMIC);
if (priv->pInterruptURB == NULL) { if (priv->interrupt_urb == NULL) {
dev_err(&priv->usb->dev, "Failed to alloc int urb\n"); dev_err(&priv->usb->dev, "Failed to alloc int urb\n");
goto free_rx_tx; 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); priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
if (priv->int_buf.data_buf == NULL) { if (priv->int_buf.data_buf == NULL) {
dev_err(&priv->usb->dev, "Failed to alloc int buf\n"); 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; goto free_rx_tx;
} }
@ -590,8 +590,8 @@ free_all:
device_free_tx_bufs(priv); device_free_tx_bufs(priv);
device_free_int_bufs(priv); device_free_int_bufs(priv);
usb_kill_urb(priv->pInterruptURB); usb_kill_urb(priv->interrupt_urb);
usb_free_urb(priv->pInterruptURB); usb_free_urb(priv->interrupt_urb);
return -ENOMEM; return -ENOMEM;
} }
@ -629,8 +629,8 @@ static void vnt_stop(struct ieee80211_hw *hw)
device_free_rx_bufs(priv); device_free_rx_bufs(priv);
device_free_int_bufs(priv); device_free_int_bufs(priv);
usb_kill_urb(priv->pInterruptURB); usb_kill_urb(priv->interrupt_urb);
usb_free_urb(priv->pInterruptURB); usb_free_urb(priv->interrupt_urb);
return; return;
} }

6
drivers/staging/vt6656/usbpipe.c
View File

@ -126,7 +126,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
priv->int_buf.in_use = true; priv->int_buf.in_use = true;
usb_fill_int_urb(priv->pInterruptURB, usb_fill_int_urb(priv->interrupt_urb,
priv->usb, priv->usb,
usb_rcvintpipe(priv->usb, 1), usb_rcvintpipe(priv->usb, 1),
priv->int_buf.data_buf, priv->int_buf.data_buf,
@ -135,7 +135,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv)
priv, priv,
priv->int_interval); priv->int_interval);
status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC); status = usb_submit_urb(priv->interrupt_urb, GFP_ATOMIC);
if (status) { if (status) {
dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status); dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status);
priv->int_buf.in_use = false; 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); vnt_int_process_data(priv);
} }
status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC); status = usb_submit_urb(priv->interrupt_urb, GFP_ATOMIC);
if (status) { if (status) {
dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status); dev_dbg(&priv->usb->dev, "Submit int URB failed %d\n", status);
} else { } else {