[PATCH net-next 0/2] Modifying format and renaming goto labels

[PATCH net-next 0/2] Modifying format and renaming goto labels

[Justin Lai]

This patch set primarily involves modifying the enum rtase_registers
format and renaming the goto labels in rtase_init_one.

Justin Lai (2):
  rtase: Modify the name of the goto label
  rtase: Modify the content format of the enum rtase_registers

 drivers/net/ethernet/realtek/rtase/rtase.h      |  2 +-
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.34.1

[PATCH net-next 1/2] rtase: Modify the name of the goto label

[Justin Lai]

Modify the name of the goto label in rtase_init_one().

Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index f8777b7663d3..874994d9ceb9 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -2115,7 +2115,7 @@ static int rtase_init_one(struct pci_dev *pdev,
 	ret = rtase_alloc_interrupt(pdev, tp);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "unable to alloc MSIX/MSI\n");
-		goto err_out_1;
+		goto err_out_del_napi;
 	}
 
 	rtase_init_netdev_ops(dev);
@@ -2148,7 +2148,7 @@ static int rtase_init_one(struct pci_dev *pdev,
 					     GFP_KERNEL);
 	if (!tp->tally_vaddr) {
 		ret = -ENOMEM;
-		goto err_out;
+		goto err_out_free_dma;
 	}
 
 	rtase_tally_counter_clear(tp);
@@ -2159,13 +2159,13 @@ static int rtase_init_one(struct pci_dev *pdev,
 
 	ret = register_netdev(dev);
 	if (ret != 0)
-		goto err_out;
+		goto err_out_free_dma;
 
 	netdev_dbg(dev, "%pM, IRQ %d\n", dev->dev_addr, dev->irq);
 
 	return 0;
 
-err_out:
+err_out_free_dma:
 	if (tp->tally_vaddr) {
 		dma_free_coherent(&pdev->dev,
 				  sizeof(*tp->tally_vaddr),
@@ -2175,7 +2175,7 @@ static int rtase_init_one(struct pci_dev *pdev,
 		tp->tally_vaddr = NULL;
 	}
 
-err_out_1:
+err_out_del_napi:
 	for (i = 0; i < tp->int_nums; i++) {
 		ivec = &tp->int_vector[i];
 		netif_napi_del(&ivec->napi);
-- 
2.34.1

[PATCH net-next 2/2] rtase: Modify the content format of the enum rtase_registers

[Justin Lai]

Remove unnecessary spaces.

Signed-off-by: Justin Lai <justinlai0215@realtek.com>
---
 drivers/net/ethernet/realtek/rtase/rtase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/realtek/rtase/rtase.h b/drivers/net/ethernet/realtek/rtase/rtase.h
index 583c33930f88..942f1e531a85 100644
--- a/drivers/net/ethernet/realtek/rtase/rtase.h
+++ b/drivers/net/ethernet/realtek/rtase/rtase.h
@@ -170,7 +170,7 @@ enum rtase_registers {
 	RTASE_INT_MITI_TX = 0x0A00,
 	RTASE_INT_MITI_RX = 0x0A80,
 
-	RTASE_VLAN_ENTRY_0     = 0xAC80,
+	RTASE_VLAN_ENTRY_0 = 0xAC80,
 };
 
 enum rtase_desc_status_bit {
-- 
2.34.1

Re: [PATCH net-next 1/2] rtase: Modify the name of the goto label

[Simon Horman]

On Thu, Nov 14, 2024 at 07:25:48PM +0800, Justin Lai wrote:
> Modify the name of the goto label in rtase_init_one().
> 
> Signed-off-by: Justin Lai <justinlai0215@realtek.com>

As this is in the context of other work to improve this driver
I think cleanup should be considered for inclusion upstream.

Reviewed-by: Simon Horman <horms@kernel.org>

...

Re: [PATCH net-next 2/2] rtase: Modify the content format of the enum rtase_registers

[Simon Horman]

On Thu, Nov 14, 2024 at 07:25:49PM +0800, Justin Lai wrote:
> Remove unnecessary spaces.
> 
> Signed-off-by: Justin Lai <justinlai0215@realtek.com>

As this is in the context of other work to improve this driver
I think cleanup should be considered for inclusion upstream.

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH net-next 0/2] Modifying format and renaming goto labels

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Thu, 14 Nov 2024 19:25:47 +0800 you wrote:
> This patch set primarily involves modifying the enum rtase_registers
> format and renaming the goto labels in rtase_init_one.
> 
> Justin Lai (2):
>   rtase: Modify the name of the goto label
>   rtase: Modify the content format of the enum rtase_registers
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] rtase: Modify the name of the goto label
    https://git.kernel.org/netdev/net-next/c/fdb53791195c
  - [net-next,2/2] rtase: Modify the content format of the enum rtase_registers
    https://git.kernel.org/netdev/net-next/c/39007e1c1c7c

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html