mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Xingquan Liu <b1n@b1n.io>
To: Philipp Hortmann <philipp.g.hortmann@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Cc: Xingquan Liu <b1n@b1n.io>
Subject: [PATCH 7/7] staging: vt6655: Rename variable aRD1Ring
Date: Sat, 21 Sep 2024 00:20:25 +0800	[thread overview]
Message-ID: <20240920162025.31465-7-b1n@b1n.io> (raw)
In-Reply-To: <20240920162025.31465-1-b1n@b1n.io>

Rename variable aRD1Ring to a_rd1_ring to fix checkpatch warning
Avoid CamelCase.

Signed-off-by: Xingquan Liu <b1n@b1n.io>
---
 drivers/staging/vt6655/card.c        |  4 ++--
 drivers/staging/vt6655/device.h      |  2 +-
 drivers/staging/vt6655/device_main.c | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 712a478aac91..c8b3b16b03c6 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -436,7 +436,7 @@ void card_v_safe_reset_rx(struct vnt_private *priv)
 
 	/* initialize RD index */
 	priv->p_curr_rd[0] = &priv->a_rd0_ring[0];
-	priv->p_curr_rd[1] = &priv->aRD1Ring[0];
+	priv->p_curr_rd[1] = &priv->a_rd1_ring[0];
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs0; uu++) {
@@ -448,7 +448,7 @@ void card_v_safe_reset_rx(struct vnt_private *priv)
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs1; uu++) {
-		p_desc = &priv->aRD1Ring[uu];
+		p_desc = &priv->a_rd1_ring[uu];
 		p_desc->rd0.res_count = cpu_to_le16(priv->rx_buf_sz);
 		p_desc->rd0.owner = OWNED_BY_NIC;
 		p_desc->rd1.req_count = cpu_to_le16(priv->rx_buf_sz);
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 8fd4d972df14..591fcd02ee8e 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -139,7 +139,7 @@ struct vnt_private {
 	struct vnt_tx_desc *ap_td1_rings;
 
 	struct vnt_rx_desc *a_rd0_ring;
-	struct vnt_rx_desc *aRD1Ring;
+	struct vnt_rx_desc *a_rd1_ring;
 	struct vnt_rx_desc *p_curr_rd[TYPE_MAXRD];
 
 	struct vnt_options opts;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 84b8a476d240..eeb2f271ba0b 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -518,7 +518,7 @@ static bool device_init_rings(struct vnt_private *priv)
 	}
 
 	priv->a_rd0_ring = vir_pool;
-	priv->aRD1Ring = vir_pool +
+	priv->a_rd1_ring = vir_pool +
 		priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc);
 
 	priv->rd0_pool_dma = priv->pool_dma;
@@ -650,7 +650,7 @@ static int device_init_rd1_ring(struct vnt_private *priv)
 	/* Init the RD1 ring entries */
 	for (i = 0; i < priv->opts.rx_descs1;
 	     i ++, curr += sizeof(struct vnt_rx_desc)) {
-		desc = &priv->aRD1Ring[i];
+		desc = &priv->a_rd1_ring[i];
 		desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_KERNEL);
 		if (!desc->rd_info) {
 			ret = -ENOMEM;
@@ -663,13 +663,13 @@ static int device_init_rd1_ring(struct vnt_private *priv)
 			goto err_free_rd;
 		}
 
-		desc->next = &priv->aRD1Ring[(i + 1) % priv->opts.rx_descs1];
+		desc->next = &priv->a_rd1_ring[(i + 1) % priv->opts.rx_descs1];
 		desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc));
 	}
 
 	if (i > 0)
-		priv->aRD1Ring[i - 1].next_desc = cpu_to_le32(priv->rd1_pool_dma);
-	priv->p_curr_rd[1] = &priv->aRD1Ring[0];
+		priv->a_rd1_ring[i - 1].next_desc = cpu_to_le32(priv->rd1_pool_dma);
+	priv->p_curr_rd[1] = &priv->a_rd1_ring[0];
 
 	return 0;
 
@@ -678,7 +678,7 @@ static int device_init_rd1_ring(struct vnt_private *priv)
 
 err_free_desc:
 	while (i--) {
-		desc = &priv->aRD1Ring[i];
+		desc = &priv->a_rd1_ring[i];
 		device_free_rx_buf(priv, desc);
 		kfree(desc->rd_info);
 	}
@@ -703,7 +703,7 @@ static void device_free_rd1_ring(struct vnt_private *priv)
 	int i;
 
 	for (i = 0; i < priv->opts.rx_descs1; i++) {
-		struct vnt_rx_desc *desc = &priv->aRD1Ring[i];
+		struct vnt_rx_desc *desc = &priv->a_rd1_ring[i];
 
 		device_free_rx_buf(priv, desc);
 		kfree(desc->rd_info);
-- 
Xingquan Liu


      parent reply	other threads:[~2024-09-20 16:21 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20 16:20 [PATCH 1/7] staging: vt6655: Rename variable apCurrTD Xingquan Liu
2024-09-20 16:20 ` [PATCH 2/7] staging: vt6655: Rename variable iTDUsed Xingquan Liu
2024-09-21 14:10   ` Philipp Hortmann
2024-09-22  4:46     ` Xingquan Liu
2024-09-23 12:09     ` Xingquan Liu
2024-09-24  7:29       ` Philipp Hortmann
2024-09-24 13:09         ` Xingquan Liu
2024-09-20 16:20 ` [PATCH 3/7] staging: vt6655: Rename function CARDvSafeResetRx Xingquan Liu
2024-09-20 16:20 ` [PATCH 4/7] staging: vt6655: Rename variable pDesc Xingquan Liu
2024-09-20 16:20 ` [PATCH 5/7] staging: vt6655: Rename variable pCurrRD Xingquan Liu
2024-09-20 16:20 ` [PATCH 6/7] staging: vt6655: Rename variable aRD0Ring Xingquan Liu
2024-09-20 16:20 ` Xingquan Liu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240920162025.31465-7-b1n@b1n.io \
    --to=b1n@b1n.io \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=philipp.g.hortmann@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®