Skip to content

Commit

Permalink
net: lan743x: Remove extranous gotos
Browse files Browse the repository at this point in the history
The gotos for cleanup aren't required, the function
might as well just return the actual error code.

Signed-off-by: Moritz Fischer <moritzf@google.com>
Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Moritz Fischer authored and David S. Miller committed Jun 2, 2023
1 parent a92fb5c commit 0f0f586
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions drivers/net/ethernet/microchip/lan743x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,22 @@ 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);
netif_info(adapter, probe, adapter->netdev,
"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_) {
Expand All @@ -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)
Expand Down

0 comments on commit 0f0f586

Please sign in to comment.