public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings
@ 2024-09-13  1:23 Xingquan Liu
  2024-09-13  1:23 ` [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings Xingquan Liu
  2024-09-13  5:08 ` [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Philipp Hortmann
  0 siblings, 2 replies; 4+ messages in thread
From: Xingquan Liu @ 2024-09-13  1:23 UTC (permalink / raw)
  To: Philipp Hortmann, Greg Kroah-Hartman, linux-staging, linux-kernel
  Cc: Xingquan Liu

Rename variable apTD0Rings to ap_td0_rings to fix checkpatch warning
Avoid CamelCase.

Signed-off-by: Xingquan Liu <b1n@b1n.io>
---
v3: Add change history
v2: Rename variable apTD1Rings

 drivers/staging/vt6655/card.c        |  6 +++---
 drivers/staging/vt6655/device.h      |  2 +-
 drivers/staging/vt6655/device_main.c | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 688c870d89bc..36bf8cde2e08 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -388,8 +388,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
 	struct vnt_tx_desc *curr_td;
 
 	/* initialize TD index */
-	priv->tail_td[0] = &priv->apTD0Rings[0];
-	priv->apCurrTD[0] = &priv->apTD0Rings[0];
+	priv->tail_td[0] = &priv->ap_td0_rings[0];
+	priv->apCurrTD[0] = &priv->ap_td0_rings[0];
 
 	priv->tail_td[1] = &priv->apTD1Rings[0];
 	priv->apCurrTD[1] = &priv->apTD1Rings[0];
@@ -398,7 +398,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
 		priv->iTDUsed[uu] = 0;
 
 	for (uu = 0; uu < priv->opts.tx_descs[0]; uu++) {
-		curr_td = &priv->apTD0Rings[uu];
+		curr_td = &priv->ap_td0_rings[uu];
 		curr_td->td0.owner = OWNED_BY_HOST;
 		/* init all Tx Packet pointer to NULL */
 	}
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 32d9cbd55222..32c51d794264 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -135,7 +135,7 @@ struct vnt_private {
 	struct vnt_tx_desc *apCurrTD[TYPE_MAXTD];
 	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
 
-	struct vnt_tx_desc *apTD0Rings;
+	struct vnt_tx_desc *ap_td0_rings;
 	struct vnt_tx_desc *apTD1Rings;
 
 	struct vnt_rx_desc *aRD0Ring;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 9ea647aefd60..a8dcd8ad3945 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -550,7 +550,7 @@ static bool device_init_rings(struct vnt_private *priv)
 		priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
 
 	/* vir_pool: pvoid type */
-	priv->apTD0Rings = vir_pool
+	priv->ap_td0_rings = vir_pool
 		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
 		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
 
@@ -720,7 +720,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
 	curr = priv->td0_pool_dma;
 	for (i = 0; i < priv->opts.tx_descs[0];
 	     i++, curr += sizeof(struct vnt_tx_desc)) {
-		desc = &priv->apTD0Rings[i];
+		desc = &priv->ap_td0_rings[i];
 		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
 		if (!desc->td_info) {
 			ret = -ENOMEM;
@@ -730,20 +730,20 @@ static int device_init_td0_ring(struct vnt_private *priv)
 		desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
 		desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
 
-		desc->next = &(priv->apTD0Rings[(i + 1) % priv->opts.tx_descs[0]]);
+		desc->next = &(priv->ap_td0_rings[(i + 1) % priv->opts.tx_descs[0]]);
 		desc->next_desc = cpu_to_le32(curr +
 					      sizeof(struct vnt_tx_desc));
 	}
 
 	if (i > 0)
-		priv->apTD0Rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
-	priv->tail_td[0] = priv->apCurrTD[0] = &priv->apTD0Rings[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];
 
 	return 0;
 
 err_free_desc:
 	while (i--) {
-		desc = &priv->apTD0Rings[i];
+		desc = &priv->ap_td0_rings[i];
 		kfree(desc->td_info);
 	}
 
@@ -795,7 +795,7 @@ static void device_free_td0_ring(struct vnt_private *priv)
 	int i;
 
 	for (i = 0; i < priv->opts.tx_descs[0]; i++) {
-		struct vnt_tx_desc *desc = &priv->apTD0Rings[i];
+		struct vnt_tx_desc *desc = &priv->ap_td0_rings[i];
 		struct vnt_td_info *td_info = desc->td_info;
 
 		dev_kfree_skb(td_info->skb);
-- 
Xingquan Liu


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings
  2024-09-13  1:23 [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Xingquan Liu
@ 2024-09-13  1:23 ` Xingquan Liu
  2024-09-13  5:09   ` Philipp Hortmann
  2024-09-13  5:08 ` [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Philipp Hortmann
  1 sibling, 1 reply; 4+ messages in thread
From: Xingquan Liu @ 2024-09-13  1:23 UTC (permalink / raw)
  To: Philipp Hortmann, Greg Kroah-Hartman, linux-staging, linux-kernel
  Cc: Xingquan Liu

Rename variable apTD1Rings to ap_td1_rings to fix checkpatch warning
Avoid CamelCase.

Signed-off-by: Xingquan Liu <b1n@b1n.io>
---
v3: Add change history
v2: Rename variable apTD1Rings

 drivers/staging/vt6655/card.c        |  6 +++---
 drivers/staging/vt6655/device.h      |  2 +-
 drivers/staging/vt6655/device_main.c | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 36bf8cde2e08..6a2e390e9493 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -391,8 +391,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
 	priv->tail_td[0] = &priv->ap_td0_rings[0];
 	priv->apCurrTD[0] = &priv->ap_td0_rings[0];
 
-	priv->tail_td[1] = &priv->apTD1Rings[0];
-	priv->apCurrTD[1] = &priv->apTD1Rings[0];
+	priv->tail_td[1] = &priv->ap_td1_rings[0];
+	priv->apCurrTD[1] = &priv->ap_td1_rings[0];
 
 	for (uu = 0; uu < TYPE_MAXTD; uu++)
 		priv->iTDUsed[uu] = 0;
@@ -403,7 +403,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
 		/* init all Tx Packet pointer to NULL */
 	}
 	for (uu = 0; uu < priv->opts.tx_descs[1]; uu++) {
-		curr_td = &priv->apTD1Rings[uu];
+		curr_td = &priv->ap_td1_rings[uu];
 		curr_td->td0.owner = OWNED_BY_HOST;
 		/* init all Tx Packet pointer to NULL */
 	}
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 32c51d794264..5eaab6b172d3 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -136,7 +136,7 @@ struct vnt_private {
 	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
 
 	struct vnt_tx_desc *ap_td0_rings;
-	struct vnt_tx_desc *apTD1Rings;
+	struct vnt_tx_desc *ap_td1_rings;
 
 	struct vnt_rx_desc *aRD0Ring;
 	struct vnt_rx_desc *aRD1Ring;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index a8dcd8ad3945..bf3ecf720206 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv)
 		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
 		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
 
-	priv->apTD1Rings = vir_pool
+	priv->ap_td1_rings = vir_pool
 		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
 		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc)
 		+ priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
@@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
 	curr = priv->td1_pool_dma;
 	for (i = 0; i < priv->opts.tx_descs[1];
 	     i++, curr += sizeof(struct vnt_tx_desc)) {
-		desc = &priv->apTD1Rings[i];
+		desc = &priv->ap_td1_rings[i];
 		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
 		if (!desc->td_info) {
 			ret = -ENOMEM;
@@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv)
 		desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ;
 		desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ;
 
-		desc->next = &(priv->apTD1Rings[(i + 1) % priv->opts.tx_descs[1]]);
+		desc->next = &(priv->ap_td1_rings[(i + 1) % priv->opts.tx_descs[1]]);
 		desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
 	}
 
 	if (i > 0)
-		priv->apTD1Rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
-	priv->tail_td[1] = priv->apCurrTD[1] = &priv->apTD1Rings[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];
 
 	return 0;
 
 err_free_desc:
 	while (i--) {
-		desc = &priv->apTD1Rings[i];
+		desc = &priv->ap_td1_rings[i];
 		kfree(desc->td_info);
 	}
 
@@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv)
 	int i;
 
 	for (i = 0; i < priv->opts.tx_descs[1]; i++) {
-		struct vnt_tx_desc *desc = &priv->apTD1Rings[i];
+		struct vnt_tx_desc *desc = &priv->ap_td1_rings[i];
 		struct vnt_td_info *td_info = desc->td_info;
 
 		dev_kfree_skb(td_info->skb);
-- 
Xingquan Liu


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings
  2024-09-13  1:23 [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Xingquan Liu
  2024-09-13  1:23 ` [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings Xingquan Liu
@ 2024-09-13  5:08 ` Philipp Hortmann
  1 sibling, 0 replies; 4+ messages in thread
From: Philipp Hortmann @ 2024-09-13  5:08 UTC (permalink / raw)
  To: Xingquan Liu, Greg Kroah-Hartman, linux-staging, linux-kernel

On 9/13/24 03:23, Xingquan Liu wrote:
> Rename variable apTD0Rings to ap_td0_rings to fix checkpatch warning
> Avoid CamelCase.
> 
> Signed-off-by: Xingquan Liu <b1n@b1n.io>
> ---
> v3: Add change history
> v2: Rename variable apTD1Rings
> 
>   drivers/staging/vt6655/card.c        |  6 +++---
>   drivers/staging/vt6655/device.h      |  2 +-
>   drivers/staging/vt6655/device_main.c | 14 +++++++-------
>   3 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
> index 688c870d89bc..36bf8cde2e08 100644
> --- a/drivers/staging/vt6655/card.c
> +++ b/drivers/staging/vt6655/card.c
> @@ -388,8 +388,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
>   	struct vnt_tx_desc *curr_td;
>   
>   	/* initialize TD index */
> -	priv->tail_td[0] = &priv->apTD0Rings[0];
> -	priv->apCurrTD[0] = &priv->apTD0Rings[0];
> +	priv->tail_td[0] = &priv->ap_td0_rings[0];
> +	priv->apCurrTD[0] = &priv->ap_td0_rings[0];
>   
>   	priv->tail_td[1] = &priv->apTD1Rings[0];
>   	priv->apCurrTD[1] = &priv->apTD1Rings[0];
> @@ -398,7 +398,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
>   		priv->iTDUsed[uu] = 0;
>   
>   	for (uu = 0; uu < priv->opts.tx_descs[0]; uu++) {
> -		curr_td = &priv->apTD0Rings[uu];
> +		curr_td = &priv->ap_td0_rings[uu];
>   		curr_td->td0.owner = OWNED_BY_HOST;
>   		/* init all Tx Packet pointer to NULL */
>   	}
> diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
> index 32d9cbd55222..32c51d794264 100644
> --- a/drivers/staging/vt6655/device.h
> +++ b/drivers/staging/vt6655/device.h
> @@ -135,7 +135,7 @@ struct vnt_private {
>   	struct vnt_tx_desc *apCurrTD[TYPE_MAXTD];
>   	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
>   
> -	struct vnt_tx_desc *apTD0Rings;
> +	struct vnt_tx_desc *ap_td0_rings;
>   	struct vnt_tx_desc *apTD1Rings;
>   
>   	struct vnt_rx_desc *aRD0Ring;
> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
> index 9ea647aefd60..a8dcd8ad3945 100644
> --- a/drivers/staging/vt6655/device_main.c
> +++ b/drivers/staging/vt6655/device_main.c
> @@ -550,7 +550,7 @@ static bool device_init_rings(struct vnt_private *priv)
>   		priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
>   
>   	/* vir_pool: pvoid type */
> -	priv->apTD0Rings = vir_pool
> +	priv->ap_td0_rings = vir_pool
>   		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
>   		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
>   
> @@ -720,7 +720,7 @@ static int device_init_td0_ring(struct vnt_private *priv)
>   	curr = priv->td0_pool_dma;
>   	for (i = 0; i < priv->opts.tx_descs[0];
>   	     i++, curr += sizeof(struct vnt_tx_desc)) {
> -		desc = &priv->apTD0Rings[i];
> +		desc = &priv->ap_td0_rings[i];
>   		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
>   		if (!desc->td_info) {
>   			ret = -ENOMEM;
> @@ -730,20 +730,20 @@ static int device_init_td0_ring(struct vnt_private *priv)
>   		desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
>   		desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
>   
> -		desc->next = &(priv->apTD0Rings[(i + 1) % priv->opts.tx_descs[0]]);
> +		desc->next = &(priv->ap_td0_rings[(i + 1) % priv->opts.tx_descs[0]]);
>   		desc->next_desc = cpu_to_le32(curr +
>   					      sizeof(struct vnt_tx_desc));
>   	}
>   
>   	if (i > 0)
> -		priv->apTD0Rings[i - 1].next_desc = cpu_to_le32(priv->td0_pool_dma);
> -	priv->tail_td[0] = priv->apCurrTD[0] = &priv->apTD0Rings[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];
>   
>   	return 0;
>   
>   err_free_desc:
>   	while (i--) {
> -		desc = &priv->apTD0Rings[i];
> +		desc = &priv->ap_td0_rings[i];
>   		kfree(desc->td_info);
>   	}
>   
> @@ -795,7 +795,7 @@ static void device_free_td0_ring(struct vnt_private *priv)
>   	int i;
>   
>   	for (i = 0; i < priv->opts.tx_descs[0]; i++) {
> -		struct vnt_tx_desc *desc = &priv->apTD0Rings[i];
> +		struct vnt_tx_desc *desc = &priv->ap_td0_rings[i];
>   		struct vnt_td_info *td_info = desc->td_info;
>   
>   		dev_kfree_skb(td_info->skb);

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings
  2024-09-13  1:23 ` [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings Xingquan Liu
@ 2024-09-13  5:09   ` Philipp Hortmann
  0 siblings, 0 replies; 4+ messages in thread
From: Philipp Hortmann @ 2024-09-13  5:09 UTC (permalink / raw)
  To: Xingquan Liu, Greg Kroah-Hartman, linux-staging, linux-kernel

On 9/13/24 03:23, Xingquan Liu wrote:
> Rename variable apTD1Rings to ap_td1_rings to fix checkpatch warning
> Avoid CamelCase.
> 
> Signed-off-by: Xingquan Liu <b1n@b1n.io>
> ---
> v3: Add change history
> v2: Rename variable apTD1Rings
> 
>   drivers/staging/vt6655/card.c        |  6 +++---
>   drivers/staging/vt6655/device.h      |  2 +-
>   drivers/staging/vt6655/device_main.c | 14 +++++++-------
>   3 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
> index 36bf8cde2e08..6a2e390e9493 100644
> --- a/drivers/staging/vt6655/card.c
> +++ b/drivers/staging/vt6655/card.c
> @@ -391,8 +391,8 @@ void card_safe_reset_tx(struct vnt_private *priv)
>   	priv->tail_td[0] = &priv->ap_td0_rings[0];
>   	priv->apCurrTD[0] = &priv->ap_td0_rings[0];
>   
> -	priv->tail_td[1] = &priv->apTD1Rings[0];
> -	priv->apCurrTD[1] = &priv->apTD1Rings[0];
> +	priv->tail_td[1] = &priv->ap_td1_rings[0];
> +	priv->apCurrTD[1] = &priv->ap_td1_rings[0];
>   
>   	for (uu = 0; uu < TYPE_MAXTD; uu++)
>   		priv->iTDUsed[uu] = 0;
> @@ -403,7 +403,7 @@ void card_safe_reset_tx(struct vnt_private *priv)
>   		/* init all Tx Packet pointer to NULL */
>   	}
>   	for (uu = 0; uu < priv->opts.tx_descs[1]; uu++) {
> -		curr_td = &priv->apTD1Rings[uu];
> +		curr_td = &priv->ap_td1_rings[uu];
>   		curr_td->td0.owner = OWNED_BY_HOST;
>   		/* init all Tx Packet pointer to NULL */
>   	}
> diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
> index 32c51d794264..5eaab6b172d3 100644
> --- a/drivers/staging/vt6655/device.h
> +++ b/drivers/staging/vt6655/device.h
> @@ -136,7 +136,7 @@ struct vnt_private {
>   	struct vnt_tx_desc *tail_td[TYPE_MAXTD];
>   
>   	struct vnt_tx_desc *ap_td0_rings;
> -	struct vnt_tx_desc *apTD1Rings;
> +	struct vnt_tx_desc *ap_td1_rings;
>   
>   	struct vnt_rx_desc *aRD0Ring;
>   	struct vnt_rx_desc *aRD1Ring;
> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
> index a8dcd8ad3945..bf3ecf720206 100644
> --- a/drivers/staging/vt6655/device_main.c
> +++ b/drivers/staging/vt6655/device_main.c
> @@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv)
>   		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
>   		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc);
>   
> -	priv->apTD1Rings = vir_pool
> +	priv->ap_td1_rings = vir_pool
>   		+ priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc)
>   		+ priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc)
>   		+ priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc);
> @@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv)
>   	curr = priv->td1_pool_dma;
>   	for (i = 0; i < priv->opts.tx_descs[1];
>   	     i++, curr += sizeof(struct vnt_tx_desc)) {
> -		desc = &priv->apTD1Rings[i];
> +		desc = &priv->ap_td1_rings[i];
>   		desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL);
>   		if (!desc->td_info) {
>   			ret = -ENOMEM;
> @@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv)
>   		desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ;
>   		desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ;
>   
> -		desc->next = &(priv->apTD1Rings[(i + 1) % priv->opts.tx_descs[1]]);
> +		desc->next = &(priv->ap_td1_rings[(i + 1) % priv->opts.tx_descs[1]]);
>   		desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
>   	}
>   
>   	if (i > 0)
> -		priv->apTD1Rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma);
> -	priv->tail_td[1] = priv->apCurrTD[1] = &priv->apTD1Rings[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];
>   
>   	return 0;
>   
>   err_free_desc:
>   	while (i--) {
> -		desc = &priv->apTD1Rings[i];
> +		desc = &priv->ap_td1_rings[i];
>   		kfree(desc->td_info);
>   	}
>   
> @@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv)
>   	int i;
>   
>   	for (i = 0; i < priv->opts.tx_descs[1]; i++) {
> -		struct vnt_tx_desc *desc = &priv->apTD1Rings[i];
> +		struct vnt_tx_desc *desc = &priv->ap_td1_rings[i];
>   		struct vnt_td_info *td_info = desc->td_info;
>   
>   		dev_kfree_skb(td_info->skb);
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-09-13  5:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-13  1:23 [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Xingquan Liu
2024-09-13  1:23 ` [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings Xingquan Liu
2024-09-13  5:09   ` Philipp Hortmann
2024-09-13  5:08 ` [PATCH v3 1/2] staging: vt6655: Rename variable apTD0Rings Philipp Hortmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox