Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-block.git] / drivers / net / ethernet / renesas / sh_eth.c

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index c5ec57ce3ddc751c10bf2f2503d1cf2251a172f5..dfa9e59c9442884dfe6a52a5c6df0c4c70fa4737 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1240,7 +1240,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
 {
        int ret = 0;
        struct sh_eth_private *mdp = netdev_priv(ndev);
-       u32 val;
 
        /* Soft Reset */
        ret = sh_eth_reset(ndev);
@@ -1293,10 +1292,8 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
        }
 
        /* PAUSE Prohibition */
-       val = (sh_eth_read(ndev, ECMR) & ECMR_DM) |
-               ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE;
-
-       sh_eth_write(ndev, val, ECMR);
+       sh_eth_write(ndev, ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) |
+                    ECMR_TE | ECMR_RE, ECMR);
 
        if (mdp->cd->set_rate)
                mdp->cd->set_rate(ndev);