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>

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 8257a641f474fa32b26d06d5a05e45bfe10d5a44..22554af3ae3622976cb581b3648f808980f6d79b 100644 (file)
--- 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 be498bca13d68afc799b08202a46e87841ee2dba..fe2f0bcd4c068f939eb01bb08d14ea48ebfda3de 100644 (file)
--- 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 126294d1f1bb788569c6f3ec3e0880689ed79a79..9a8874917f8d5307cf85ffa71974b05fa1ec6cb8 100644 (file)
--- 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 {