[PATCH 1/7] staging: vt6655: Rename variable apCurrTD

[PATCH 1/7] staging: vt6655: Rename variable apCurrTD

[Xingquan Liu]

Rename variable apCurrTD to ap_curr_td 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 | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 6a2e390e9493..3b7284a23479 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -389,10 +389,10 @@ void card_safe_reset_tx(struct vnt_private *priv)
 
 	/* initialize TD index */
 	priv->tail_td[0] = &priv->ap_td0_rings[0];
-	priv->apCurrTD[0] = &priv->ap_td0_rings[0];
+	priv->ap_curr_td[0] = &priv->ap_td0_rings[0];
 
 	priv->tail_td[1] = &priv->ap_td1_rings[0];
-	priv->apCurrTD[1] = &priv->ap_td1_rings[0];
+	priv->ap_curr_td[1] = &priv->ap_td1_rings[0];
 
 	for (uu = 0; uu < TYPE_MAXTD; uu++)
 		priv->iTDUsed[uu] = 0;
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 5eaab6b172d3..f4e14c65b1a8 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -132,7 +132,7 @@ struct vnt_private {
 
 	volatile int                iTDUsed[TYPE_MAXTD];
 
-	struct vnt_tx_desc *apCurrTD[TYPE_MAXTD];
+	struct vnt_tx_desc *ap_curr_td[TYPE_MAXTD];
 	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
 
 	struct vnt_tx_desc *ap_td0_rings;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index bf3ecf720206..052ebe0095a5 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -737,7 +737,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
 
 	if (i > 0)
 		priv->ap_td0_rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
-	priv->tail_td[0] = priv->apCurrTD[0] = &priv->ap_td0_rings[0];
+	priv->tail_td[0] = priv->ap_curr_td[0] = &priv->ap_td0_rings[0];
 
 	return 0;
 
@@ -777,7 +777,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
 
 	if (i > 0)
 		priv->ap_td1_rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
-	priv->tail_td[1] = priv->apCurrTD[1] = &priv->ap_td1_rings[0];
+	priv->tail_td[1] = priv->ap_curr_td[1] = &priv->ap_td1_rings[0];
 
 	return 0;
 
@@ -1235,7 +1235,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
 		return -ENOMEM;
 	}
 
-	head_td = priv->apCurrTD[dma_idx];
+	head_td = priv->ap_curr_td[dma_idx];
 
 	head_td->td1.tcr = 0;
 
@@ -1244,7 +1244,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
 	if (dma_idx == TYPE_AC0DMA)
 		head_td->td_info->flags = TD_FLAGS_NETIF_SKB;
 
-	priv->apCurrTD[dma_idx] = head_td->next;
+	priv->ap_curr_td[dma_idx] = head_td->next;
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-- 
Xingquan Liu

[PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Xingquan Liu]

Rename variable iTDUsed to i_td_used to fix checkpatch warning
Avoid CamelCase.

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

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 3b7284a23479..cda8ad4b3513 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -395,7 +395,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
 	priv->ap_curr_td[1] = &priv->ap_td1_rings[0];
 
 	for (uu = 0; uu < TYPE_MAXTD; uu++)
-		priv->iTDUsed[uu] = 0;
+		priv->i_td_used[uu] = 0;
 
 	for (uu = 0; uu < priv->opts.tx_descs[0]; uu++) {
 		curr_td = &priv->ap_td0_rings[uu];
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index f4e14c65b1a8..57a396ad4d72 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -70,7 +70,7 @@
 
 /* BUILD OBJ mode */
 
-#define	AVAIL_TD(p, q)	((p)->opts.tx_descs[(q)] - ((p)->iTDUsed[(q)]))
+#define	AVAIL_TD(p, q)	((p)->opts.tx_descs[(q)] - ((p)->i_td_used[(q)]))
 
 /* 0:11A 1:11B 2:11G */
 #define BB_TYPE_11A    0
@@ -130,7 +130,7 @@ struct vnt_private {
 
 	spinlock_t                  lock;
 
-	volatile int                iTDUsed[TYPE_MAXTD];
+	volatile int                i_td_used[TYPE_MAXTD];
 
 	struct vnt_tx_desc *ap_curr_td[TYPE_MAXTD];
 	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 052ebe0095a5..53e3aae29a59 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -969,7 +969,7 @@ static int device_tx_srv(struct vnt_private *priv, unsigned int idx)
 	unsigned char byTsr0;
 	unsigned char byTsr1;
 
-	for (desc = priv->tail_td[idx]; priv->iTDUsed[idx] > 0; desc = desc->next) {
+	for (desc = priv->tail_td[idx]; priv->i_td_used[idx] > 0; desc = desc->next) {
 		if (desc->td0.owner == OWNED_BY_NIC)
 			break;
 		if (works++ > 15)
@@ -1003,7 +1003,7 @@ static int device_tx_srv(struct vnt_private *priv, unsigned int idx)
 			vnt_int_report_rate(priv, desc->td_info, byTsr0, byTsr1);
 
 			device_free_tx_buf(priv, desc);
-			priv->iTDUsed[idx]--;
+			priv->i_td_used[idx]--;
 		}
 	}
 
@@ -1270,7 +1270,7 @@ static int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
 	else
 		vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_TXDMACTL0);
 
-	priv->iTDUsed[dma_idx]++;
+	priv->i_td_used[dma_idx]++;
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-- 
Xingquan Liu

Re: [PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Philipp Hortmann]

On 9/20/24 18:20, Xingquan Liu wrote:
> Rename variable iTDUsed to i_td_used to fix checkpatch warning
> Avoid CamelCase.


Hi Xingquan,

please do not take the first letter when it is "hungarian notation". On 
a first look it seems that the p is for pointer, i is for integer, a is 
for array.

If you send in a second version of this patch please use a change 
history. Description from Dan under:
https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/

Thanks for your support.

Bye Philipp

Re: [PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Xingquan Liu]

[-- Attachment #1: Type: text/plain, Size: 35 bytes --]

Ok, thanks.

--
Xingquan Liu


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 350 bytes --]

Re: [PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Xingquan Liu]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

Hi,

I'm a bit confused. Should I rename struct vnt_tx_desc *apCurrTD[TYPE_MAXTD];
to curr_td?

It looks like 'ap' means array pointer.

For struct vnt_rx_desc *aRD0Ring;, where 'a' doesn't means array, should
I rename it to rd0_ring?

--
Xingquan Liu


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 350 bytes --]

Re: [PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Philipp Hortmann]

On 9/23/24 2:09 PM, Xingquan Liu wrote:
> Hi,
> 
> I'm a bit confused. Should I rename struct vnt_tx_desc 
> *apCurrTD[TYPE_MAXTD];
> to curr_td?
> It looks like 'ap' means array pointer.

Hi Xingquan,

yes I think so as well.
This line shows this:
priv->apCurrTD[0] = &priv->ap_td0_rings[0];

> 
> For struct vnt_rx_desc *aRD0Ring;, where 'a' doesn't means array, should
> I rename it to rd0_ring?
> 

When the "a" does not belong to hungarian notation it can remain.


The following is just my personal opinion:
You can keep working on this driver and your patches will remain in the 
git. But I think I will propose to delete this driver. Reason is that it 
supports maximum 54MBit/s and the connection is always weak. Its form 
factor is mini PCI that is really old. I use an adapter from mini PCI to 
PCI to get it into my Desktop PC. It furthermore is not buyable anymore.

I like to focus on the hardware that is really well useable and on the 
market available:

For example:
rtl8712  (r8712u)
Backard Bell: AW-NU120

Thanks for your support.

Bye Philipp

Re: [PATCH 2/7] staging: vt6655: Rename variable iTDUsed

[Xingquan Liu]

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

On Tue Sep 24, 2024 at 3:29 PM CST, Philipp Hortmann wrote:
> The following is just my personal opinion:
> You can keep working on this driver and your patches will remain in the
> git. But I think I will propose to delete this driver. Reason is that it
> supports maximum 54MBit/s and the connection is always weak. Its form
> factor is mini PCI that is really old. I use an adapter from mini PCI to
> PCI to get it into my Desktop PC. It furthermore is not buyable anymore.
>
> I like to focus on the hardware that is really well useable and on the
> market available:
>
> For example:
> rtl8712  (r8712u)
> Backard Bell: AW-NU120

I agree. I'll take my time to learn and make more practical contributions.

--
Xingquan Liu


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 350 bytes --]

[PATCH 3/7] staging: vt6655: Rename function CARDvSafeResetRx

[Xingquan Liu]

Rename function CARDvSafeResetRx to card_v_safe_reset_rx to fix checkpatch
warning Avoid CamelCase.

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

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index cda8ad4b3513..e25073e013cf 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -429,7 +429,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
  *
  * Return Value: none
  */
-void CARDvSafeResetRx(struct vnt_private *priv)
+void card_v_safe_reset_rx(struct vnt_private *priv)
 {
 	unsigned int uu;
 	struct vnt_rx_desc *pDesc;
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index f6b462ebca51..8c1f81840972 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -51,7 +51,7 @@ u64 card_get_next_tbtt(u64 qwTSF, unsigned short beacon_interval);
 u64 card_get_tsf_offset(unsigned char rx_rate, u64 qwTSF1, u64 qwTSF2);
 unsigned char card_get_pkt_type(struct vnt_private *priv);
 void card_safe_reset_tx(struct vnt_private *priv);
-void CARDvSafeResetRx(struct vnt_private *priv);
+void card_v_safe_reset_rx(struct vnt_private *priv);
 void card_radio_power_off(struct vnt_private *priv);
 bool card_set_phy_parameter(struct vnt_private *priv, u8 bb_type);
 bool card_update_tsf(struct vnt_private *priv, unsigned char rx_rate,
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 53e3aae29a59..08e99f9b802f 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -461,7 +461,7 @@ static void device_init_registers(struct vnt_private *priv)
 	pr_debug("Network address = %pM\n", priv->abyCurrentNetAddr);
 
 	/* reset Tx pointer */
-	CARDvSafeResetRx(priv);
+	card_v_safe_reset_rx(priv);
 	/* reset Rx pointer */
 	card_safe_reset_tx(priv);
 
-- 
Xingquan Liu

[PATCH 4/7] staging: vt6655: Rename variable pDesc

[Xingquan Liu]

Rename variable pDesc to p_desc to fix checkpatch warning
Avoid CamelCase.

Signed-off-by: Xingquan Liu <b1n@b1n.io>
---
 drivers/staging/vt6655/card.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index e25073e013cf..9a546aaf1ad5 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -432,7 +432,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
 void card_v_safe_reset_rx(struct vnt_private *priv)
 {
 	unsigned int uu;
-	struct vnt_rx_desc *pDesc;
+	struct vnt_rx_desc *p_desc;
 
 	/* initialize RD index */
 	priv->pCurrRD[0] = &priv->aRD0Ring[0];
@@ -440,18 +440,18 @@ void card_v_safe_reset_rx(struct vnt_private *priv)
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs0; uu++) {
-		pDesc = &priv->aRD0Ring[uu];
-		pDesc->rd0.res_count = cpu_to_le16(priv->rx_buf_sz);
-		pDesc->rd0.owner = OWNED_BY_NIC;
-		pDesc->rd1.req_count = cpu_to_le16(priv->rx_buf_sz);
+		p_desc = &priv->aRD0Ring[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);
 	}
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs1; uu++) {
-		pDesc = &priv->aRD1Ring[uu];
-		pDesc->rd0.res_count = cpu_to_le16(priv->rx_buf_sz);
-		pDesc->rd0.owner = OWNED_BY_NIC;
-		pDesc->rd1.req_count = cpu_to_le16(priv->rx_buf_sz);
+		p_desc = &priv->aRD1Ring[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);
 	}
 
 	/* set perPkt mode */
-- 
Xingquan Liu

[PATCH 5/7] staging: vt6655: Rename variable pCurrRD

[Xingquan Liu]

Rename variable pCurrRD to p_curr_rd 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 | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 9a546aaf1ad5..58b9bd451a54 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -435,8 +435,8 @@ void card_v_safe_reset_rx(struct vnt_private *priv)
 	struct vnt_rx_desc *p_desc;
 
 	/* initialize RD index */
-	priv->pCurrRD[0] = &priv->aRD0Ring[0];
-	priv->pCurrRD[1] = &priv->aRD1Ring[0];
+	priv->p_curr_rd[0] = &priv->aRD0Ring[0];
+	priv->p_curr_rd[1] = &priv->aRD1Ring[0];
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs0; uu++) {
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 57a396ad4d72..b89cd4707b86 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -140,7 +140,7 @@ struct vnt_private {
 
 	struct vnt_rx_desc *aRD0Ring;
 	struct vnt_rx_desc *aRD1Ring;
-	struct vnt_rx_desc *pCurrRD[TYPE_MAXRD];
+	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 08e99f9b802f..caee5f90edb8 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -623,7 +623,7 @@ static int device_init_rd0_ring(struct vnt_private *priv)
 
 	if (i > 0)
 		priv->aRD0Ring[i - 1].next_desc = cpu_to_le32(priv->rd0_pool_dma);
-	priv->pCurrRD[0] = &priv->aRD0Ring[0];
+	priv->p_curr_rd[0] = &priv->aRD0Ring[0];
 
 	return 0;
 
@@ -669,7 +669,7 @@ static int device_init_rd1_ring(struct vnt_private *priv)
 
 	if (i > 0)
 		priv->aRD1Ring[i - 1].next_desc = cpu_to_le32(priv->rd1_pool_dma);
-	priv->pCurrRD[1] = &priv->aRD1Ring[0];
+	priv->p_curr_rd[1] = &priv->aRD1Ring[0];
 
 	return 0;
 
@@ -823,7 +823,7 @@ static int device_rx_srv(struct vnt_private *priv, unsigned int idx)
 	struct vnt_rx_desc *rd;
 	int works = 0;
 
-	for (rd = priv->pCurrRD[idx];
+	for (rd = priv->p_curr_rd[idx];
 	     rd->rd0.owner == OWNED_BY_HOST;
 	     rd = rd->next) {
 		if (works++ > 15)
@@ -842,7 +842,7 @@ static int device_rx_srv(struct vnt_private *priv, unsigned int idx)
 		rd->rd0.owner = OWNED_BY_NIC;
 	}
 
-	priv->pCurrRD[idx] = rd;
+	priv->p_curr_rd[idx] = rd;
 
 	return works;
 }
-- 
Xingquan Liu

[PATCH 6/7] staging: vt6655: Rename variable aRD0Ring

[Xingquan Liu]

Rename variable aRD0Ring to a_rd0_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 | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 58b9bd451a54..712a478aac91 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -435,12 +435,12 @@ void card_v_safe_reset_rx(struct vnt_private *priv)
 	struct vnt_rx_desc *p_desc;
 
 	/* initialize RD index */
-	priv->p_curr_rd[0] = &priv->aRD0Ring[0];
+	priv->p_curr_rd[0] = &priv->a_rd0_ring[0];
 	priv->p_curr_rd[1] = &priv->aRD1Ring[0];
 
 	/* init state, all RD is chip's */
 	for (uu = 0; uu < priv->opts.rx_descs0; uu++) {
-		p_desc = &priv->aRD0Ring[uu];
+		p_desc = &priv->a_rd0_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 b89cd4707b86..8fd4d972df14 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -138,7 +138,7 @@ struct vnt_private {
 	struct vnt_tx_desc *ap_td0_rings;
 	struct vnt_tx_desc *ap_td1_rings;
 
-	struct vnt_rx_desc *aRD0Ring;
+	struct vnt_rx_desc *a_rd0_ring;
 	struct vnt_rx_desc *aRD1Ring;
 	struct vnt_rx_desc *p_curr_rd[TYPE_MAXRD];
 
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index caee5f90edb8..84b8a476d240 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -517,7 +517,7 @@ static bool device_init_rings(struct vnt_private *priv)
 		return false;
 	}
 
-	priv->aRD0Ring = vir_pool;
+	priv->a_rd0_ring = vir_pool;
 	priv->aRD1Ring = vir_pool +
 		priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc);
 
@@ -584,7 +584,7 @@ static void device_free_rings(struct vnt_private *priv)
 			  priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) +
 			  priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc) +
 			  priv->opts.tx_descs[1] * sizeof(struct vnt_tx_desc),
-			  priv->aRD0Ring, priv->pool_dma);
+			  priv->a_rd0_ring, priv->pool_dma);
 
 	dma_free_coherent(&priv->pcid->dev,
 			  priv->opts.tx_descs[0] * PKT_BUF_SZ +
@@ -604,7 +604,7 @@ static int device_init_rd0_ring(struct vnt_private *priv)
 	/* Init the RD0 ring entries */
 	for (i = 0; i < priv->opts.rx_descs0;
 	     i ++, curr += sizeof(struct vnt_rx_desc)) {
-		desc = &priv->aRD0Ring[i];
+		desc = &priv->a_rd0_ring[i];
 		desc->rd_info = kzalloc(sizeof(*desc->rd_info), GFP_KERNEL);
 		if (!desc->rd_info) {
 			ret = -ENOMEM;
@@ -617,13 +617,13 @@ static int device_init_rd0_ring(struct vnt_private *priv)
 			goto err_free_rd;
 		}
 
-		desc->next = &priv->aRD0Ring[(i + 1) % priv->opts.rx_descs0];
+		desc->next = &priv->a_rd0_ring[(i + 1) % priv->opts.rx_descs0];
 		desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc));
 	}
 
 	if (i > 0)
-		priv->aRD0Ring[i - 1].next_desc = cpu_to_le32(priv->rd0_pool_dma);
-	priv->p_curr_rd[0] = &priv->aRD0Ring[0];
+		priv->a_rd0_ring[i - 1].next_desc = cpu_to_le32(priv->rd0_pool_dma);
+	priv->p_curr_rd[0] = &priv->a_rd0_ring[0];
 
 	return 0;
 
@@ -632,7 +632,7 @@ static int device_init_rd0_ring(struct vnt_private *priv)
 
 err_free_desc:
 	while (i--) {
-		desc = &priv->aRD0Ring[i];
+		desc = &priv->a_rd0_ring[i];
 		device_free_rx_buf(priv, desc);
 		kfree(desc->rd_info);
 	}
@@ -691,7 +691,7 @@ static void device_free_rd0_ring(struct vnt_private *priv)
 	int i;
 
 	for (i = 0; i < priv->opts.rx_descs0; i++) {
-		struct vnt_rx_desc *desc = &priv->aRD0Ring[i];
+		struct vnt_rx_desc *desc = &priv->a_rd0_ring[i];
 
 		device_free_rx_buf(priv, desc);
 		kfree(desc->rd_info);
-- 
Xingquan Liu

[PATCH 7/7] staging: vt6655: Rename variable aRD1Ring

[Xingquan Liu]

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