drivers/net: return operator cleanup
Change "return (EXPR);" to "return EXPR;" return is not a function, parentheses are not required. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
cb4dfe562c
commit
807540baae
@@ -266,7 +266,7 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
|
||||
if (diff == TX_DESC_CNT)
|
||||
diff = MAX_TX_DESC_CNT;
|
||||
}
|
||||
return (bp->tx_ring_size - diff);
|
||||
return bp->tx_ring_size - diff;
|
||||
}
|
||||
|
||||
static u32
|
||||
@@ -299,7 +299,7 @@ bnx2_shmem_wr(struct bnx2 *bp, u32 offset, u32 val)
|
||||
static u32
|
||||
bnx2_shmem_rd(struct bnx2 *bp, u32 offset)
|
||||
{
|
||||
return (bnx2_reg_rd_ind(bp, bp->shmem_base + offset));
|
||||
return bnx2_reg_rd_ind(bp, bp->shmem_base + offset);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -977,9 +977,9 @@ bnx2_report_fw_link(struct bnx2 *bp)
|
||||
static char *
|
||||
bnx2_xceiver_str(struct bnx2 *bp)
|
||||
{
|
||||
return ((bp->phy_port == PORT_FIBRE) ? "SerDes" :
|
||||
return (bp->phy_port == PORT_FIBRE) ? "SerDes" :
|
||||
((bp->phy_flags & BNX2_PHY_FLAG_SERDES) ? "Remote Copper" :
|
||||
"Copper"));
|
||||
"Copper");
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1758,7 +1758,7 @@ __acquires(&bp->phy_lock)
|
||||
u32 new_adv = 0;
|
||||
|
||||
if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP)
|
||||
return (bnx2_setup_remote_phy(bp, port));
|
||||
return bnx2_setup_remote_phy(bp, port);
|
||||
|
||||
if (!(bp->autoneg & AUTONEG_SPEED)) {
|
||||
u32 new_bmcr;
|
||||
@@ -2171,10 +2171,10 @@ __acquires(&bp->phy_lock)
|
||||
return 0;
|
||||
|
||||
if (bp->phy_flags & BNX2_PHY_FLAG_SERDES) {
|
||||
return (bnx2_setup_serdes_phy(bp, port));
|
||||
return bnx2_setup_serdes_phy(bp, port);
|
||||
}
|
||||
else {
|
||||
return (bnx2_setup_copper_phy(bp));
|
||||
return bnx2_setup_copper_phy(bp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7582,9 +7582,9 @@ bnx2_set_tx_csum(struct net_device *dev, u32 data)
|
||||
struct bnx2 *bp = netdev_priv(dev);
|
||||
|
||||
if (CHIP_NUM(bp) == CHIP_NUM_5709)
|
||||
return (ethtool_op_set_tx_ipv6_csum(dev, data));
|
||||
return ethtool_op_set_tx_ipv6_csum(dev, data);
|
||||
else
|
||||
return (ethtool_op_set_tx_csum(dev, data));
|
||||
return ethtool_op_set_tx_csum(dev, data);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -7705,7 +7705,7 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu)
|
||||
return -EINVAL;
|
||||
|
||||
dev->mtu = new_mtu;
|
||||
return (bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size));
|
||||
return bnx2_change_ring_size(bp, bp->rx_ring_size, bp->tx_ring_size);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NET_POLL_CONTROLLER
|
||||
|
Reference in New Issue
Block a user