netdev - Re: [PATCH] liquidio: fix duplicated code for different branches

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170814071434.GA1046@felix-thinkpad.cavium.com>
Date:   Mon, 14 Aug 2017 00:14:34 -0700
From:   Felix Manlunas <felix.manlunas@...ium.com>
To:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>
Cc:     Derek Chickles <derek.chickles@...iumnetworks.com>,
        Satanand Burla <satananda.burla@...iumnetworks.com>,
        Raghu Vatsavayi <raghu.vatsavayi@...iumnetworks.com>,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] liquidio: fix duplicated code for different branches

On Sat, Aug 12, 2017 at 08:38:55PM -0500, Gustavo A. R. Silva wrote:
> Refactor code in order to avoid identical code for different branches.
> 
> This issue was detected with the help of Coccinelle.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@...eddedor.com>
> ---
> This code was tested by compilation only.
> 
>  drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
> index b78e296..4f65c08 100644
> --- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
> +++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
> @@ -578,23 +578,18 @@ static int lio_set_phys_id(struct net_device *netdev,
>  		break;
>  
>  	case ETHTOOL_ID_ON:
> -		if (oct->chip_id == OCTEON_CN66XX) {
> +		if (oct->chip_id == OCTEON_CN66XX)
>  			octnet_gpio_access(netdev, VITESSE_PHY_GPIO_CFG,
>  					   VITESSE_PHY_GPIO_HIGH);
> -
> -		} else if (oct->chip_id == OCTEON_CN68XX) {
> -			return -EINVAL;
> -		} else {
> +		else
>  			return -EINVAL;
> -		}
> +
>  		break;
>  
>  	case ETHTOOL_ID_OFF:
>  		if (oct->chip_id == OCTEON_CN66XX)
>  			octnet_gpio_access(netdev, VITESSE_PHY_GPIO_CFG,
>  					   VITESSE_PHY_GPIO_LOW);
> -		else if (oct->chip_id == OCTEON_CN68XX)
> -			return -EINVAL;
>  		else
>  			return -EINVAL;
>  
> -- 
> 2.5.0
> 

Acked-by: Felix Manlunas <felix.manlunas@...ium.com>