aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2014-08-25 07:31:16 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-25 18:13:15 -0400
commita77e4accce126d50d02705c687dd0b5025b63f89 (patch)
tree624949e292b5d3e3e68a1d77246813774549a923 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
parentb209af9981ee6b4274a0a46810dd0210e6520010 (diff)
stmmac: simple cleanups
This adds simple cleanups for stmmac, removing test we know is always true, fixing whitespace, and moving code out of if(). Signed-off-by: Pavel Machek <pavel@denx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 08addd653728..8fcc64c37ff1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -818,7 +818,7 @@ static int stmmac_init_phy(struct net_device *dev)
818 /* Stop Advertising 1000BASE Capability if interface is not GMII */ 818 /* Stop Advertising 1000BASE Capability if interface is not GMII */
819 if ((interface == PHY_INTERFACE_MODE_MII) || 819 if ((interface == PHY_INTERFACE_MODE_MII) ||
820 (interface == PHY_INTERFACE_MODE_RMII) || 820 (interface == PHY_INTERFACE_MODE_RMII) ||
821 (max_speed < 1000 && max_speed > 0)) 821 (max_speed < 1000 && max_speed > 0))
822 phydev->advertising &= ~(SUPPORTED_1000baseT_Half | 822 phydev->advertising &= ~(SUPPORTED_1000baseT_Half |
823 SUPPORTED_1000baseT_Full); 823 SUPPORTED_1000baseT_Full);
824 824