staging: vt6656: struct vnt_private rename cbRD to num_rcb
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 19 Jul 2014 11:30:03 +0000 (12:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Jul 2014 19:11:55 +0000 (12:11 -0700)
Number of rcb

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/main_usb.c

index ffcbaca8622a1f2f8abf7e915e853df4652c74fc..6b8c97f7ceeb7e8b0673e3f4b1ef4728be579cee 100644 (file)
@@ -289,7 +289,7 @@ struct vnt_private {
 
        /* Variables to track resources for the BULK In Pipe */
        struct vnt_rcb *rcb[CB_MAX_RX_DESC];
-       u32 cbRD;
+       u32 num_rcb;
 
        /* Variables to track resources for the BULK Out Pipe */
        struct vnt_usb_send_context *tx_context[CB_MAX_TX_DESC];
index 0802ecdf74805852aedf5106446c069cee51cfa3..a612b153fff05439bd98f621049451b848c3000f 100644 (file)
@@ -114,9 +114,9 @@ static void device_set_options(struct vnt_private *priv)
 
        /* Set number of RX buffers */
        if (vnt_rx_buffers < CB_MIN_RX_DESC || vnt_rx_buffers > CB_MAX_RX_DESC)
-               priv->cbRD = RX_DESC_DEF0;
+               priv->num_rcb = RX_DESC_DEF0;
        else
-               priv->cbRD = vnt_rx_buffers;
+               priv->num_rcb = vnt_rx_buffers;
 
        priv->byShortRetryLimit = SHORT_RETRY_DEF;
        priv->byLongRetryLimit = LONG_RETRY_DEF;
@@ -407,7 +407,7 @@ static void device_free_rx_bufs(struct vnt_private *priv)
        struct vnt_rcb *rcb;
        int ii;
 
-       for (ii = 0; ii < priv->cbRD; ii++) {
+       for (ii = 0; ii < priv->num_rcb; ii++) {
                rcb = priv->rcb[ii];
                if (!rcb)
                        continue;
@@ -475,7 +475,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
                tx_context->in_use = false;
        }
 
-       for (ii = 0; ii < priv->cbRD; ii++) {
+       for (ii = 0; ii < priv->num_rcb; ii++) {
                priv->rcb[ii] = kzalloc(sizeof(struct vnt_rcb), GFP_KERNEL);
                if (!priv->rcb[ii]) {
                        dev_err(&priv->usb->dev,