From: Malcolm Priestley Date: Sat, 19 Jul 2014 11:30:03 +0000 (+0100) Subject: staging: vt6656: struct vnt_private rename cbRD to num_rcb X-Git-Tag: v3.17-rc1~123^2~441 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6da4738f068cbf826104ef5e8971c255d6d6d437;p=karo-tx-linux.git staging: vt6656: struct vnt_private rename cbRD to num_rcb Number of rcb Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index ffcbaca8622a..6b8c97f7ceeb 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -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]; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 0802ecdf7480..a612b153fff0 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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,