diff options
| author | Gustavo A. R. Silva | 2017-08-13 03:38:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-14 19:58:09 +0200 |
| commit | b5e7dc47425860172eec6e1116ace7759d13b999 (patch) | |
| tree | 1daae85740ce7e5aa329e0ed9061064ec3f80302 /drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | |
| parent | liquidio: update debug console logging mechanism (diff) | |
| download | kernel-qcow2-linux-b5e7dc47425860172eec6e1116ace7759d13b999.tar.gz kernel-qcow2-linux-b5e7dc47425860172eec6e1116ace7759d13b999.tar.xz kernel-qcow2-linux-b5e7dc47425860172eec6e1116ace7759d13b999.zip | |
liquidio: fix duplicated code for different branches
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@embeddedor.com>
Acked-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/lio_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 11 |
1 files 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 b78e296c4cba..4f65c08461f6 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; |