aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2016-01-10 16:27:38 -0500
committerDavid S. Miller <davem@davemloft.net>2016-01-11 17:31:09 -0500
commit1c1fa821199c707a193efd3bc93c4ac9357bafa0 (patch)
tree8060974a68209b431395d16536e2eaaa5675ecc8
parent66530bdf85eb1d72a0c399665e09a2c2298501c6 (diff)
ravb: stop reading ECMR in ravb_emac_init()
The code in ravb_emac_init() twiddling the ECMR bits always looked a bit strange to me: if one intends to respect 'priv->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/ravb_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 467d41698fd5..fef4fa120d8a 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -338,16 +338,13 @@ error:
338static void ravb_emac_init(struct net_device *ndev) 338static void ravb_emac_init(struct net_device *ndev)
339{ 339{
340 struct ravb_private *priv = netdev_priv(ndev); 340 struct ravb_private *priv = netdev_priv(ndev);
341 u32 ecmr;
342 341
343 /* Receive frame limit set register */ 342 /* Receive frame limit set register */
344 ravb_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN, RFLR); 343 ravb_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN, RFLR);
345 344
346 /* PAUSE prohibition */ 345 /* PAUSE prohibition */
347 ecmr = ravb_read(ndev, ECMR); 346 ravb_write(ndev, ECMR_ZPF | (priv->duplex ? ECMR_DM : 0) |
348 ecmr &= ECMR_DM; 347 ECMR_TE | ECMR_RE, ECMR);
349 ecmr |= ECMR_ZPF | (priv->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE;
350 ravb_write(ndev, ecmr, ECMR);
351 348
352 ravb_set_rate(ndev); 349 ravb_set_rate(ndev);
353 350