staging: vt6656: struct vnt_private rename cdTD to num_tx_context

number of 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 6b8c97f..416a55d 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -293,7 +293,7 @@ struct vnt_private {
 
        /* Variables to track resources for the BULK Out Pipe */
        struct vnt_usb_send_context *tx_context[CB_MAX_TX_DESC];
-       u32 cbTD;
+       u32 num_tx_context;
 
        /* Variables to track resources for the Interrupt In Pipe */
        struct vnt_interrupt_buffer int_buf;

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index e404d9e..1ea2433 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -75,7 +75,7 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
        u8 tx_retry = (tsr & 0xf0) >> 4;
        s8 idx;
 
-       if (pkt_no >= priv->cbTD)
+       if (pkt_no >= priv->num_tx_context)
                return -EINVAL;
 
        context = priv->tx_context[pkt_no];

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index a612b15..ba2467c 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -108,9 +108,9 @@ static void device_set_options(struct vnt_private *priv)
 {
        /* Set number of TX buffers */
        if (vnt_tx_buffers < CB_MIN_TX_DESC || vnt_tx_buffers > CB_MAX_TX_DESC)
-               priv->cbTD = TX_DESC_DEF0;
+               priv->num_tx_context = TX_DESC_DEF0;
        else
-               priv->cbTD = vnt_tx_buffers;
+               priv->num_tx_context = vnt_tx_buffers;
 
        /* Set number of RX buffers */
        if (vnt_rx_buffers < CB_MIN_RX_DESC || vnt_rx_buffers > CB_MAX_RX_DESC)
@@ -388,7 +388,7 @@ static void device_free_tx_bufs(struct vnt_private *priv)
        struct vnt_usb_send_context *tx_context;
        int ii;
 
-       for (ii = 0; ii < priv->cbTD; ii++) {
+       for (ii = 0; ii < priv->num_tx_context; ii++) {
                tx_context = priv->tx_context[ii];
                /* deallocate URBs */
                if (tx_context->urb) {
@@ -452,7 +452,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
        struct vnt_rcb *rcb;
        int ii;
 
-       for (ii = 0; ii < priv->cbTD; ii++) {
+       for (ii = 0; ii < priv->num_tx_context; ii++) {
                tx_context = kmalloc(sizeof(struct vnt_usb_send_context),
                                                                GFP_KERNEL);
                if (tx_context == NULL) {

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index f3bbfba..c4b9ca2 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -81,7 +81,7 @@ static struct vnt_usb_send_context
 
        dev_dbg(&priv->usb->dev, "%s\n", __func__);
 
-       for (ii = 0; ii < priv->cbTD; ii++) {
+       for (ii = 0; ii < priv->num_tx_context; ii++) {
                if (!priv->tx_context[ii])
                        return NULL;
 
@@ -97,7 +97,7 @@ static struct vnt_usb_send_context
                }
        }
 
-       if (ii == priv->cbTD)
+       if (ii == priv->num_tx_context)
                dev_dbg(&priv->usb->dev, "%s No Free Tx Context\n", __func__);
 
        return NULL;