Skip to content

Commit 6c36c1b

Browse files
b1nhackgregkh
authored andcommitted
staging: vt6655: Rename variable apTD0Rings
Rename variable apTD0Rings to ap_td0_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-1-b1n@b1n.io Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ea0fca5 commit 6c36c1b

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
@@ -388,8 +388,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
388388
struct vnt_tx_desc *curr_td;
389389

390390
/* initialize TD index */
391-
priv->tail_td[0] = &priv->apTD0Rings[0];
392-
priv->apCurrTD[0] = &priv->apTD0Rings[0];
391+
priv->tail_td[0] = &priv->ap_td0_rings[0];
392+
priv->apCurrTD[0] = &priv->ap_td0_rings[0];
393393

394394
priv->tail_td[1] = &priv->apTD1Rings[0];
395395
priv->apCurrTD[1] = &priv->apTD1Rings[0];
@@ -398,7 +398,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
398398
priv->iTDUsed[uu] = 0;
399399

400400
for (uu = 0; uu < priv->opts.tx_descs[0]; uu++) {
401-
curr_td = &priv->apTD0Rings[uu];
401+
curr_td = &priv->ap_td0_rings[uu];
402402
curr_td->td0.owner = OWNED_BY_HOST;
403403
/* init all Tx Packet pointer to NULL */
404404
}

drivers/staging/vt6655/device.h

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

138-
struct vnt_tx_desc *apTD0Rings;
138+
struct vnt_tx_desc *ap_td0_rings;
139139
struct vnt_tx_desc *apTD1Rings;
140140

141141
struct vnt_rx_desc *aRD0Ring;

drivers/staging/vt6655/device_main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ static bool device_init_rings(struct vnt_private *priv)
550550
priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
551551

552552
/* vir_pool: pvoid type */
553-
priv->apTD0Rings = vir_pool
553+
priv->ap_td0_rings = vir_pool
554554
+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
555555
+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
556556

@@ -720,7 +720,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
720720
curr = priv->td0_pool_dma;
721721
for (i = 0; i < priv->opts.tx_descs[0];
722722
i++, curr += sizeof(struct vnt_tx_desc)) {
723-
desc = &priv->apTD0Rings[i];
723+
desc = &priv->ap_td0_rings[i];
724724
desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
725725
if (!desc->td_info) {
726726
ret = -ENOMEM;
@@ -730,20 +730,20 @@ static int device_init_td0_ring(struct vnt_private *priv)
730730
desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
731731
desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
732732

733-
desc->next = &(priv->apTD0Rings[(i + 1) % priv->opts.tx_descs[0]]);
733+
desc->next = &(priv->ap_td0_rings[(i + 1) % priv->opts.tx_descs[0]]);
734734
desc->next_desc = cpu_to_le32(curr +
735735
sizeof(struct vnt_tx_desc));
736736
}
737737

738738
if (i > 0)
739-
priv->apTD0Rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
740-
priv->tail_td[0] = priv->apCurrTD[0] = &priv->apTD0Rings[0];
739+
priv->ap_td0_rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
740+
priv->tail_td[0] = priv->apCurrTD[0] = &priv->ap_td0_rings[0];
741741

742742
return 0;
743743

744744
err_free_desc:
745745
while (i--) {
746-
desc = &priv->apTD0Rings[i];
746+
desc = &priv->ap_td0_rings[i];
747747
kfree(desc->td_info);
748748
}
749749

@@ -795,7 +795,7 @@ static void device_free_td0_ring(struct vnt_private *priv)
795795
int i;
796796

797797
for (i = 0; i < priv->opts.tx_descs[0]; i++) {
798-
struct vnt_tx_desc *desc = &priv->apTD0Rings[i];
798+
struct vnt_tx_desc *desc = &priv->ap_td0_rings[i];
799799
struct vnt_td_info *td_info = desc->td_info;
800800

801801
dev_kfree_skb(td_info->skb);

0 commit comments

Comments
 (0)