[PATCH net-next v2 06/14] net: mvpp2: simplify the link_event function

[Antoine Tenart]

The link_event function is somewhat complicated. This cosmetic patch
simplifies it.

Signed-off-by: Antoine Tenart <antoine.ten...@free-electrons.com>
---
 drivers/net/ethernet/marvell/mvpp2.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2.c 
b/drivers/net/ethernet/marvell/mvpp2.c
index 498a4969dc58..a9dea9b344de 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -5740,7 +5740,6 @@ static void mvpp2_link_event(struct net_device *dev)
 {
        struct mvpp2_port *port = netdev_priv(dev);
        struct phy_device *phydev = dev->phydev;
-       int status_change = 0;
 
        if (phydev->link) {
                if ((port->speed != phydev->speed) ||
@@ -5751,23 +5750,19 @@ static void mvpp2_link_event(struct net_device *dev)
        }
 
        if (phydev->link != port->link) {
-               if (!phydev->link) {
-                       port->duplex = -1;
-                       port->speed = 0;
-               }
-
                port->link = phydev->link;
-               status_change = 1;
-       }
 
-       if (status_change) {
                if (phydev->link) {
                        mvpp2_egress_enable(port);
                        mvpp2_ingress_enable(port);
                } else {
+                       port->duplex = -1;
+                       port->speed = 0;
+
                        mvpp2_ingress_disable(port);
                        mvpp2_egress_disable(port);
                }
+
                phy_print_status(phydev);
        }
 }
-- 
2.13.5