staging: vt6655: rename pOpts and sOpts to opts.

+4 -4

drivers/staging/vt6655/card.c

··· 523 523 for (uu = 0; uu < TYPE_MAXTD; uu++) 524 524 pDevice->iTDUsed[uu] = 0; 525 525 526 - for (uu = 0; uu < pDevice->sOpts.tx_descs[0]; uu++) { 526 + for (uu = 0; uu < pDevice->opts.tx_descs[0]; uu++) { 527 527 pCurrTD = &(pDevice->apTD0Rings[uu]); 528 528 pCurrTD->td0.owner = OWNED_BY_HOST; 529 529 /* init all Tx Packet pointer to NULL */ 530 530 } 531 - for (uu = 0; uu < pDevice->sOpts.tx_descs[1]; uu++) { 531 + for (uu = 0; uu < pDevice->opts.tx_descs[1]; uu++) { 532 532 pCurrTD = &(pDevice->apTD1Rings[uu]); 533 533 pCurrTD->td0.owner = OWNED_BY_HOST; 534 534 /* init all Tx Packet pointer to NULL */ ··· 571 571 pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]); 572 572 573 573 /* init state, all RD is chip's */ 574 - for (uu = 0; uu < pDevice->sOpts.rx_descs0; uu++) { 574 + for (uu = 0; uu < pDevice->opts.rx_descs0; uu++) { 575 575 pDesc = &(pDevice->aRD0Ring[uu]); 576 576 pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); 577 577 pDesc->rd0.owner = OWNED_BY_NIC; ··· 579 579 } 580 580 581 581 /* init state, all RD is chip's */ 582 - for (uu = 0; uu < pDevice->sOpts.rx_descs1; uu++) { 582 + for (uu = 0; uu < pDevice->opts.rx_descs1; uu++) { 583 583 pDesc = &(pDevice->aRD1Ring[uu]); 584 584 pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); 585 585 pDesc->rd0.owner = OWNED_BY_NIC;

+2 -2

drivers/staging/vt6655/device.h

··· 85 85 86 86 /* BUILD OBJ mode */ 87 87 88 - #define AVAIL_TD(p, q) ((p)->sOpts.tx_descs[(q)] - ((p)->iTDUsed[(q)])) 88 + #define AVAIL_TD(p, q) ((p)->opts.tx_descs[(q)] - ((p)->iTDUsed[(q)])) 89 89 90 90 /* 0:11A 1:11B 2:11G */ 91 91 #define BB_TYPE_11A 0 ··· 159 159 struct vnt_rx_desc *aRD1Ring; 160 160 struct vnt_rx_desc *pCurrRD[TYPE_MAXRD]; 161 161 162 - struct vnt_options sOpts; 162 + struct vnt_options opts; 163 163 164 164 u32 flags; 165 165

+54 -54

drivers/staging/vt6655/device_main.c

··· 168 168 169 169 static void device_get_options(struct vnt_private *priv) 170 170 { 171 - struct vnt_options *pOpts = &priv->sOpts; 171 + struct vnt_options *opts = &priv->opts; 172 172 173 - pOpts->rx_descs0 = RX_DESC_DEF0; 174 - pOpts->rx_descs1 = RX_DESC_DEF1; 175 - pOpts->tx_descs[0] = TX_DESC_DEF0; 176 - pOpts->tx_descs[1] = TX_DESC_DEF1; 177 - pOpts->int_works = INT_WORKS_DEF; 173 + opts->rx_descs0 = RX_DESC_DEF0; 174 + opts->rx_descs1 = RX_DESC_DEF1; 175 + opts->tx_descs[0] = TX_DESC_DEF0; 176 + opts->tx_descs[1] = TX_DESC_DEF1; 177 + opts->int_works = INT_WORKS_DEF; 178 178 179 - pOpts->short_retry = SHORT_RETRY_DEF; 180 - pOpts->long_retry = LONG_RETRY_DEF; 181 - pOpts->bbp_type = BBP_TYPE_DEF; 179 + opts->short_retry = SHORT_RETRY_DEF; 180 + opts->long_retry = LONG_RETRY_DEF; 181 + opts->bbp_type = BBP_TYPE_DEF; 182 182 } 183 183 184 184 static void 185 185 device_set_options(struct vnt_private *priv) 186 186 { 187 - priv->byShortRetryLimit = priv->sOpts.short_retry; 188 - priv->byLongRetryLimit = priv->sOpts.long_retry; 189 - priv->byBBType = priv->sOpts.bbp_type; 187 + priv->byShortRetryLimit = priv->opts.short_retry; 188 + priv->byLongRetryLimit = priv->opts.long_retry; 189 + priv->byBBType = priv->opts.bbp_type; 190 190 priv->byPacketType = priv->byBBType; 191 191 priv->byAutoFBCtrl = AUTO_FB_0; 192 192 priv->bUpdateBBVGA = true; ··· 452 452 453 453 /*allocate all RD/TD rings a single pool*/ 454 454 vir_pool = dma_zalloc_coherent(&priv->pcid->dev, 455 - priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc) + 456 - priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc) + 457 - priv->sOpts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 458 - priv->sOpts.tx_descs[1] * sizeof(struct vnt_tx_desc), 455 + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) + 456 + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) + 457 + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 458 + priv->opts.tx_descs[1] * sizeof(struct vnt_tx_desc), 459 459 &priv->pool_dma, GFP_ATOMIC); 460 460 if (vir_pool == NULL) { 461 461 dev_err(&priv->pcid->dev, "allocate desc dma memory failed\n"); ··· 464 464 465 465 priv->aRD0Ring = vir_pool; 466 466 priv->aRD1Ring = vir_pool + 467 - priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc); 467 + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc); 468 468 469 469 priv->rd0_pool_dma = priv->pool_dma; 470 470 priv->rd1_pool_dma = priv->rd0_pool_dma + 471 - priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc); 471 + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc); 472 472 473 473 priv->tx0_bufs = dma_zalloc_coherent(&priv->pcid->dev, 474 - priv->sOpts.tx_descs[0] * PKT_BUF_SZ + 475 - priv->sOpts.tx_descs[1] * PKT_BUF_SZ + 474 + priv->opts.tx_descs[0] * PKT_BUF_SZ + 475 + priv->opts.tx_descs[1] * PKT_BUF_SZ + 476 476 CB_BEACON_BUF_SIZE + 477 477 CB_MAX_BUF_SIZE, 478 478 &priv->tx_bufs_dma0, ··· 481 481 dev_err(&priv->pcid->dev, "allocate buf dma memory failed\n"); 482 482 483 483 dma_free_coherent(&priv->pcid->dev, 484 - priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc) + 485 - priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc) + 486 - priv->sOpts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 487 - priv->sOpts.tx_descs[1] * sizeof(struct vnt_tx_desc), 484 + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) + 485 + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) + 486 + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 487 + priv->opts.tx_descs[1] * sizeof(struct vnt_tx_desc), 488 488 vir_pool, priv->pool_dma); 489 489 return false; 490 490 } 491 491 492 492 priv->td0_pool_dma = priv->rd1_pool_dma + 493 - priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc); 493 + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc); 494 494 495 495 priv->td1_pool_dma = priv->td0_pool_dma + 496 - priv->sOpts.tx_descs[0] * sizeof(struct vnt_tx_desc); 496 + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc); 497 497 498 498 /* vir_pool: pvoid type */ 499 499 priv->apTD0Rings = vir_pool 500 - + priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc) 501 - + priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc); 500 + + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) 501 + + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc); 502 502 503 503 priv->apTD1Rings = vir_pool 504 - + priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc) 505 - + priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc) 506 - + priv->sOpts.tx_descs[0] * sizeof(struct vnt_tx_desc); 504 + + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) 505 + + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) 506 + + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc); 507 507 508 508 priv->tx1_bufs = priv->tx0_bufs + 509 - priv->sOpts.tx_descs[0] * PKT_BUF_SZ; 509 + priv->opts.tx_descs[0] * PKT_BUF_SZ; 510 510 511 511 priv->tx_beacon_bufs = priv->tx1_bufs + 512 - priv->sOpts.tx_descs[1] * PKT_BUF_SZ; 512 + priv->opts.tx_descs[1] * PKT_BUF_SZ; 513 513 514 514 priv->pbyTmpBuff = priv->tx_beacon_bufs + 515 515 CB_BEACON_BUF_SIZE; 516 516 517 517 priv->tx_bufs_dma1 = priv->tx_bufs_dma0 + 518 - priv->sOpts.tx_descs[0] * PKT_BUF_SZ; 518 + priv->opts.tx_descs[0] * PKT_BUF_SZ; 519 519 520 520 priv->tx_beacon_dma = priv->tx_bufs_dma1 + 521 - priv->sOpts.tx_descs[1] * PKT_BUF_SZ; 521 + priv->opts.tx_descs[1] * PKT_BUF_SZ; 522 522 523 523 return true; 524 524 } ··· 526 526 static void device_free_rings(struct vnt_private *priv) 527 527 { 528 528 dma_free_coherent(&priv->pcid->dev, 529 - priv->sOpts.rx_descs0 * sizeof(struct vnt_rx_desc) + 530 - priv->sOpts.rx_descs1 * sizeof(struct vnt_rx_desc) + 531 - priv->sOpts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 532 - priv->sOpts.tx_descs[1] * sizeof(struct vnt_tx_desc), 529 + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) + 530 + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) + 531 + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc) + 532 + priv->opts.tx_descs[1] * sizeof(struct vnt_tx_desc), 533 533 priv->aRD0Ring, priv->pool_dma); 534 534 535 535 if (priv->tx0_bufs) 536 536 dma_free_coherent(&priv->pcid->dev, 537 - priv->sOpts.tx_descs[0] * PKT_BUF_SZ + 538 - priv->sOpts.tx_descs[1] * PKT_BUF_SZ + 537 + priv->opts.tx_descs[0] * PKT_BUF_SZ + 538 + priv->opts.tx_descs[1] * PKT_BUF_SZ + 539 539 CB_BEACON_BUF_SIZE + 540 540 CB_MAX_BUF_SIZE, 541 541 priv->tx0_bufs, priv->tx_bufs_dma0); ··· 548 548 struct vnt_rx_desc *desc; 549 549 550 550 /* Init the RD0 ring entries */ 551 - for (i = 0; i < priv->sOpts.rx_descs0; 551 + for (i = 0; i < priv->opts.rx_descs0; 552 552 i ++, curr += sizeof(struct vnt_rx_desc)) { 553 553 desc = &priv->aRD0Ring[i]; 554 554 desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC); ··· 556 556 if (!device_alloc_rx_buf(priv, desc)) 557 557 dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); 558 558 559 - desc->next = &(priv->aRD0Ring[(i+1) % priv->sOpts.rx_descs0]); 559 + desc->next = &(priv->aRD0Ring[(i+1) % priv->opts.rx_descs0]); 560 560 desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); 561 561 } 562 562 ··· 572 572 struct vnt_rx_desc *desc; 573 573 574 574 /* Init the RD1 ring entries */ 575 - for (i = 0; i < priv->sOpts.rx_descs1; 575 + for (i = 0; i < priv->opts.rx_descs1; 576 576 i ++, curr += sizeof(struct vnt_rx_desc)) { 577 577 desc = &priv->aRD1Ring[i]; 578 578 desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_ATOMIC); ··· 580 580 if (!device_alloc_rx_buf(priv, desc)) 581 581 dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); 582 582 583 - desc->next = &(priv->aRD1Ring[(i+1) % priv->sOpts.rx_descs1]); 583 + desc->next = &(priv->aRD1Ring[(i+1) % priv->opts.rx_descs1]); 584 584 desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); 585 585 } 586 586 ··· 593 593 { 594 594 int i; 595 595 596 - for (i = 0; i < priv->sOpts.rx_descs0; i++) { 596 + for (i = 0; i < priv->opts.rx_descs0; i++) { 597 597 struct vnt_rx_desc *desc = &(priv->aRD0Ring[i]); 598 598 struct vnt_rd_info *rd_info = desc->rd_info; 599 599 ··· 610 610 { 611 611 int i; 612 612 613 - for (i = 0; i < priv->sOpts.rx_descs1; i++) { 613 + for (i = 0; i < priv->opts.rx_descs1; i++) { 614 614 struct vnt_rx_desc *desc = &priv->aRD1Ring[i]; 615 615 struct vnt_rd_info *rd_info = desc->rd_info; 616 616 ··· 630 630 struct vnt_tx_desc *desc; 631 631 632 632 curr = priv->td0_pool_dma; 633 - for (i = 0; i < priv->sOpts.tx_descs[0]; 633 + for (i = 0; i < priv->opts.tx_descs[0]; 634 634 i++, curr += sizeof(struct vnt_tx_desc)) { 635 635 desc = &priv->apTD0Rings[i]; 636 636 desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_ATOMIC); ··· 638 638 desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ; 639 639 desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ; 640 640 641 - desc->next = &(priv->apTD0Rings[(i+1) % priv->sOpts.tx_descs[0]]); 641 + desc->next = &(priv->apTD0Rings[(i+1) % priv->opts.tx_descs[0]]); 642 642 desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc)); 643 643 } 644 644 ··· 655 655 656 656 /* Init the TD ring entries */ 657 657 curr = priv->td1_pool_dma; 658 - for (i = 0; i < priv->sOpts.tx_descs[1]; 658 + for (i = 0; i < priv->opts.tx_descs[1]; 659 659 i++, curr += sizeof(struct vnt_tx_desc)) { 660 660 desc = &priv->apTD1Rings[i]; 661 661 desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_ATOMIC); ··· 663 663 desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ; 664 664 desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ; 665 665 666 - desc->next = &(priv->apTD1Rings[(i + 1) % priv->sOpts.tx_descs[1]]); 666 + desc->next = &(priv->apTD1Rings[(i + 1) % priv->opts.tx_descs[1]]); 667 667 desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc)); 668 668 } 669 669 ··· 676 676 { 677 677 int i; 678 678 679 - for (i = 0; i < priv->sOpts.tx_descs[0]; i++) { 679 + for (i = 0; i < priv->opts.tx_descs[0]; i++) { 680 680 struct vnt_tx_desc *desc = &priv->apTD0Rings[i]; 681 681 struct vnt_td_info *td_info = desc->td_info; 682 682 ··· 689 689 { 690 690 int i; 691 691 692 - for (i = 0; i < priv->sOpts.tx_descs[1]; i++) { 692 + for (i = 0; i < priv->opts.tx_descs[1]; i++) { 693 693 struct vnt_tx_desc *desc = &priv->apTD1Rings[i]; 694 694 struct vnt_td_info *td_info = desc->td_info; 695 695 ··· 1057 1057 MACvReceive0(priv->PortOffset); 1058 1058 MACvReceive1(priv->PortOffset); 1059 1059 1060 - if (max_count > priv->sOpts.int_works) 1060 + if (max_count > priv->opts.int_works) 1061 1061 break; 1062 1062 } 1063 1063