OSDN Git Service

staging: vt6656: struct vnt_private rename apTD to tx_context
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 18 Jul 2014 05:36:16 +0000 (06:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jul 2014 23:06:23 +0000 (16:06 -0700)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/int.c
drivers/staging/vt6656/main_usb.c
drivers/staging/vt6656/rxtx.c

index a5a6c39..757d500 100644 (file)
@@ -292,7 +292,7 @@ struct vnt_private {
        u32 cbRD;
 
        /* Variables to track resources for the BULK Out Pipe */
-       struct vnt_usb_send_context *apTD[CB_MAX_TX_DESC];
+       struct vnt_usb_send_context *tx_context[CB_MAX_TX_DESC];
        u32 cbTD;
 
        /* Variables to track resources for the Interrupt In Pipe */
index 87ac6a1..e404d9e 100644 (file)
@@ -78,7 +78,7 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
        if (pkt_no >= priv->cbTD)
                return -EINVAL;
 
-       context = priv->apTD[pkt_no];
+       context = priv->tx_context[pkt_no];
 
        if (!context->skb)
                return -EINVAL;
index 5c8ff98..ff4e18d 100644 (file)
@@ -399,7 +399,7 @@ static void device_free_tx_bufs(struct vnt_private *priv)
        int ii;
 
        for (ii = 0; ii < priv->cbTD; ii++) {
-               tx_context = priv->apTD[ii];
+               tx_context = priv->tx_context[ii];
                /* deallocate URBs */
                if (tx_context->urb) {
                        usb_kill_urb(tx_context->urb);
@@ -471,7 +471,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
                        goto free_tx;
                }
 
-               priv->apTD[ii] = tx_context;
+               priv->tx_context[ii] = tx_context;
                tx_context->priv = priv;
                tx_context->pkt_no = ii;
 
index 76b7f17..f3bbfba 100644 (file)
@@ -82,10 +82,10 @@ static struct vnt_usb_send_context
        dev_dbg(&priv->usb->dev, "%s\n", __func__);
 
        for (ii = 0; ii < priv->cbTD; ii++) {
-               if (!priv->apTD[ii])
+               if (!priv->tx_context[ii])
                        return NULL;
 
-               context = priv->apTD[ii];
+               context = priv->tx_context[ii];
                if (context->in_use == false) {
                        context->in_use = true;
                        memset(context->data, 0,