summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/card.c
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2015-10-17 11:33:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 09:04:27 -0700
commitbc667b99ccb7392c33b9fd46360356b11755979c (patch)
tree8b4139ec1f725c8c7517b2545a0b94c5d81ce289 /drivers/staging/vt6655/card.c
parent068b998835168b5107d1e62a346f52b9f44ed10b (diff)
downloadlinux-stable-bc667b99ccb7392c33b9fd46360356b11755979c.tar.gz
linux-stable-bc667b99ccb7392c33b9fd46360356b11755979c.tar.bz2
linux-stable-bc667b99ccb7392c33b9fd46360356b11755979c.zip
staging: vt6655: rename pOpts and sOpts to opts.
bring pointers and members into line. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/card.c')
-rw-r--r--drivers/staging/vt6655/card.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 71c9b97634ea..c45e494fc9a9 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -523,12 +523,12 @@ CARDvSafeResetTx(
for (uu = 0; uu < TYPE_MAXTD; uu++)
pDevice->iTDUsed[uu] = 0;
- for (uu = 0; uu < pDevice->sOpts.tx_descs[0]; uu++) {
+ for (uu = 0; uu < pDevice->opts.tx_descs[0]; uu++) {
pCurrTD = &(pDevice->apTD0Rings[uu]);
pCurrTD->td0.owner = OWNED_BY_HOST;
/* init all Tx Packet pointer to NULL */
}
- for (uu = 0; uu < pDevice->sOpts.tx_descs[1]; uu++) {
+ for (uu = 0; uu < pDevice->opts.tx_descs[1]; uu++) {
pCurrTD = &(pDevice->apTD1Rings[uu]);
pCurrTD->td0.owner = OWNED_BY_HOST;
/* init all Tx Packet pointer to NULL */
@@ -571,7 +571,7 @@ CARDvSafeResetRx(
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
/* init state, all RD is chip's */
- for (uu = 0; uu < pDevice->sOpts.rx_descs0; uu++) {
+ for (uu = 0; uu < pDevice->opts.rx_descs0; uu++) {
pDesc = &(pDevice->aRD0Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC;
@@ -579,7 +579,7 @@ CARDvSafeResetRx(
}
/* init state, all RD is chip's */
- for (uu = 0; uu < pDevice->sOpts.rx_descs1; uu++) {
+ for (uu = 0; uu < pDevice->opts.rx_descs1; uu++) {
pDesc = &(pDevice->aRD1Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC;