staging: vt6656: struct vnt_private rename apTD to tx_context

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 a5a6c3949ea43ebdde4f6c8766030c31edec567f..757d500deef110b3b48fd9b343f07fb4a846a704 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -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 */

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 87ac6a17f75c87559b84a5fd81c358d9a0e6753d..e404d9e6a0e7b30e8a0b6068feeec97bfaeb4cee 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -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;

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 5c8ff9871535752d604b9da4dcd2717ee08041c0..ff4e18d2e8f7bcf7aed8c85ee9c71de300f7ff54 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -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;
 

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 76b7f173f4fa8a8cdd8be39f1060c1ffe8a299e6..f3bbfba1b1384a50cd81d5abdff6a5ce07fed686 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -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,