aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2016-01-10 16:28:14 -0500
committerDavid S. Miller <davem@davemloft.net>2016-01-11 17:31:09 -0500
commitbffa731f8f44e0444afc56875a10fd07e9a08c6c (patch)
tree77fe59349bc0de5be7377046e678eaa02f3ba0db
parent1c1fa821199c707a193efd3bc93c4ac9357bafa0 (diff)
sh_eth: stop reading ECMR in sh_eth_dev_init()
The code in sh_eth_dev_init() twiddling the ECMR bits always looked a bit strange to me: if one intends to respect 'mdp->duplex', why save old value of the ECMR.DM bit? As all the other bits are zeroed anyway, we don't really need to read ECMR before writing to it. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 6a8fc0f341ff..9c1e290ca4ee 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1289,7 +1289,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
1289{ 1289{
1290 int ret = 0; 1290 int ret = 0;
1291 struct sh_eth_private *mdp = netdev_priv(ndev); 1291 struct sh_eth_private *mdp = netdev_priv(ndev);
1292 u32 val;
1293 1292
1294 /* Soft Reset */ 1293 /* Soft Reset */
1295 ret = sh_eth_reset(ndev); 1294 ret = sh_eth_reset(ndev);
@@ -1342,10 +1341,8 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
1342 } 1341 }
1343 1342
1344 /* PAUSE Prohibition */ 1343 /* PAUSE Prohibition */
1345 val = (sh_eth_read(ndev, ECMR) & ECMR_DM) | 1344 sh_eth_write(ndev, ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) |
1346 ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE; 1345 ECMR_TE | ECMR_RE, ECMR);
1347
1348 sh_eth_write(ndev, val, ECMR);
1349 1346
1350 if (mdp->cd->set_rate) 1347 if (mdp->cd->set_rate)
1351 mdp->cd->set_rate(ndev); 1348 mdp->cd->set_rate(ndev);