Skip to content

Commit b4fdf9b

Browse files
b1nhackgregkh
authored andcommitted
staging: vt6655: Rename variable apTD1Rings
Rename variable apTD1Rings to ap_td1_rings to fix checkpatch warning Avoid CamelCase. Signed-off-by: Xingquan Liu <b1n@b1n.io> Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/20240913012343.42579-2-b1n@b1n.io Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6c36c1b commit b4fdf9b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

drivers/staging/vt6655/card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
391391
priv->tail_td[0] = &priv->ap_td0_rings[0];
392392
priv->apCurrTD[0] = &priv->ap_td0_rings[0];
393393

394-
priv->tail_td[1] = &priv->apTD1Rings[0];
395-
priv->apCurrTD[1] = &priv->apTD1Rings[0];
394+
priv->tail_td[1] = &priv->ap_td1_rings[0];
395+
priv->apCurrTD[1] = &priv->ap_td1_rings[0];
396396

397397
for (uu = 0; uu < TYPE_MAXTD; uu++)
398398
priv->iTDUsed[uu] = 0;
@@ -403,7 +403,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
403403
/* init all Tx Packet pointer to NULL */
404404
}
405405
for (uu = 0; uu < priv->opts.tx_descs[1]; uu++) {
406-
curr_td = &priv->apTD1Rings[uu];
406+
curr_td = &priv->ap_td1_rings[uu];
407407
curr_td->td0.owner = OWNED_BY_HOST;
408408
/* init all Tx Packet pointer to NULL */
409409
}

drivers/staging/vt6655/device.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct vnt_private {
136136
struct vnt_tx_desc *tail_td[TYPE_MAXTD];
137137

138138
struct vnt_tx_desc *ap_td0_rings;
139-
struct vnt_tx_desc *apTD1Rings;
139+
struct vnt_tx_desc *ap_td1_rings;
140140

141141
struct vnt_rx_desc *aRD0Ring;
142142
struct vnt_rx_desc *aRD1Ring;

drivers/staging/vt6655/device_main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv)
554554
+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
555555
+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
556556

557-
priv->apTD1Rings = vir_pool
557+
priv->ap_td1_rings = vir_pool
558558
+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
559559
+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc)
560560
+ priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
@@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
761761
curr = priv->td1_pool_dma;
762762
for (i = 0; i < priv->opts.tx_descs[1];
763763
i++, curr += sizeof(struct vnt_tx_desc)) {
764-
desc = &priv->apTD1Rings[i];
764+
desc = &priv->ap_td1_rings[i];
765765
desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
766766
if (!desc->td_info) {
767767
ret = -ENOMEM;
@@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv)
771771
desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ;
772772
desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ;
773773

774-
desc->next = &(priv->apTD1Rings[(i + 1) % priv->opts.tx_descs[1]]);
774+
desc->next = &(priv->ap_td1_rings[(i + 1) % priv->opts.tx_descs[1]]);
775775
desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
776776
}
777777

778778
if (i > 0)
779-
priv->apTD1Rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
780-
priv->tail_td[1] = priv->apCurrTD[1] = &priv->apTD1Rings[0];
779+
priv->ap_td1_rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
780+
priv->tail_td[1] = priv->apCurrTD[1] = &priv->ap_td1_rings[0];
781781

782782
return 0;
783783

784784
err_free_desc:
785785
while (i--) {
786-
desc = &priv->apTD1Rings[i];
786+
desc = &priv->ap_td1_rings[i];
787787
kfree(desc->td_info);
788788
}
789789

@@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv)
808808
int i;
809809

810810
for (i = 0; i < priv->opts.tx_descs[1]; i++) {
811-
struct vnt_tx_desc *desc = &priv->apTD1Rings[i];
811+
struct vnt_tx_desc *desc = &priv->ap_td1_rings[i];
812812
struct vnt_td_info *td_info = desc->td_info;
813813

814814
dev_kfree_skb(td_info->skb);

0 commit comments

Comments
 (0)