net: lan743x: Remove extranous gotos
Subsystems (3)
PATCH 1/1 net: lan743x: Remove extranous gotos
The gotos for cleanup aren't required, the function might as well just return the actual error code.
Signed-off-by Moritz Fischer <[email protected]>
--- drivers/net/ethernet/microchip/lan743x_main.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.c +5 -15
@@ -160,16 +160,13 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter) {struct lan743x_csr *csr = &adapter->csr;resource_size_t bar_start, bar_length; -int result; bar_start =pci_resource_start (adapter->pdev,0 ); bar_length =pci_resource_len (adapter->pdev,0 ); csr->csr_address =devm_ioremap (&adapter->pdev->dev, bar_start, bar_length); -if (!csr->csr_address) { - result = -ENOMEM ; - goto clean_up; - } +if (!csr->csr_address) +return -ENOMEM ; csr->id_rev =lan743x_csr_read (adapter,ID_REV ); csr->fpga_rev =lan743x_csr_read (adapter,FPGA_REV );
@@ -177,10 +174,8 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter)"ID_REV = 0x%08X, FPGA_REV = %d.%d\n" , csr->id_rev,FPGA_REV_GET_MAJOR_ (csr->fpga_rev), FPGA_REV_GET_MINOR_(csr->fpga_rev)); -if (!ID_REV_IS_VALID_CHIP_ID_ (csr->id_rev)) { - result = -ENODEV ; - goto clean_up; - } +if (!ID_REV_IS_VALID_CHIP_ID_ (csr->id_rev)) +return -ENODEV ; csr->flags =LAN743X_CSR_FLAG_SUPPORTS_INTR_AUTO_SET_CLR ;switch (csr->id_rev &ID_REV_CHIP_REV_MASK_ ) {
@@ -193,12 +188,7 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter)break ; } - result =lan743x_csr_light_reset (adapter); -if (result) - goto clean_up; -return 0 ; -clean_up: -return result; +return lan743x_csr_light_reset (adapter); }static void lan743x_intr_software_isr (struct lan743x_adapter *adapter)
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Quoted 4 lines · Moritz Fischer
The gotos for cleanup aren't required, the function might as well just return the actual error code.
Signed-off-by Moritz Fischer <[email protected]>
Reviewed-by Siddharth Vadapalli <[email protected]>
Quoted 54 lines
--- drivers/net/ethernet/microchip/lan743x_main.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/net/ethernet/microchip/lan743x_main.c +5
-15@@ -160,16 +160,13 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter) {struct lan743x_csr *csr = &adapter->csr;resource_size_t bar_start, bar_length; -int result; bar_start =pci_resource_start (adapter->pdev,0 ); bar_length =pci_resource_len (adapter->pdev,0 ); csr->csr_address =devm_ioremap (&adapter->pdev->dev, bar_start, bar_length); -if (!csr->csr_address) { - result = -ENOMEM ; - goto clean_up; - } +if (!csr->csr_address) +return -ENOMEM ; csr->id_rev =lan743x_csr_read (adapter,ID_REV ); csr->fpga_rev =lan743x_csr_read (adapter,FPGA_REV );@@ -177,10 +174,8 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter)"ID_REV = 0x%08X, FPGA_REV = %d.%d\n" , csr->id_rev,FPGA_REV_GET_MAJOR_ (csr->fpga_rev), FPGA_REV_GET_MINOR_(csr->fpga_rev)); -if (!ID_REV_IS_VALID_CHIP_ID_ (csr->id_rev)) { - result = -ENODEV ; - goto clean_up; - } +if (!ID_REV_IS_VALID_CHIP_ID_ (csr->id_rev)) +return -ENODEV ; csr->flags =LAN743X_CSR_FLAG_SUPPORTS_INTR_AUTO_SET_CLR ;switch (csr->id_rev &ID_REV_CHIP_REV_MASK_ ) {@@ -193,12 +188,7 @@ static int lan743x_csr_init(struct lan743x_adapter *adapter)break ; } - result =lan743x_csr_light_reset (adapter); -if (result) - goto clean_up; -return 0 ; -clean_up: -return result; +return lan743x_csr_light_reset (adapter); }static void lan743x_intr_software_isr (struct lan743x_adapter *adapter)
Signature · 2 lines
Regards, Siddharth.
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 7 lines · On Fri, 2 Jun 2023 00:04:14 +0000 you wrote:
The gotos for cleanup aren't required, the function might as well just return the actual error code.
Signed-off-by Moritz Fischer <[email protected]>--- drivers/net/ethernet/microchip/lan743x_main.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-)
Here is the summary with links:
- [net-next] net: lan743x: Remove extranous gotos
https://git.kernel.org/netdev/net-next/c/0f0f5868689e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html