netdev - Re: [PATCH net-next] net: lan743x: Remove extranous gotos

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Fri, 2 Jun 2023 14:24:16 +0530
From: Siddharth Vadapalli <s-vadapalli@...com>
To: Moritz Fischer <moritzf@...gle.com>, <netdev@...r.kernel.org>
CC: <pabeni@...hat.com>, <kuba@...nel.org>, <edumazet@...gle.com>,
        <davem@...emloft.net>, <bryan.whitehead@...rochip.com>,
        <UNGLinuxDriver@...rochip.com>, <s-vadapalli@...com>
Subject: Re: [PATCH net-next] net: lan743x: Remove extranous gotos



On 02/06/23 05:34, Moritz Fischer wrote:
> The gotos for cleanup aren't required, the function
> might as well just return the actual error code.
> 
> Signed-off-by: Moritz Fischer <moritzf@...gle.com>

Reviewed-by: Siddharth Vadapalli <s-vadapalli@...com>

> ---
>  drivers/net/ethernet/microchip/lan743x_main.c | 20 +++++--------------
>  1 file changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
> index 957d96a91a8a..f1bded993edc 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -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)

-- 
Regards,
Siddharth.