Merge tag 'samsung-soc-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk...

[linux-2.6-microblaze.git] / drivers / net / dsa / microchip / ksz9477.c

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 4a9239b..3cb22d1 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -452,15 +452,6 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,
        ksz_pwrite8(dev, port, P_STP_CTRL, data);
        p->stp_state = state;
        mutex_lock(&dev->dev_mutex);
-       if (data & PORT_RX_ENABLE)
-               dev->rx_ports |= (1 << port);
-       else
-               dev->rx_ports &= ~(1 << port);
-       if (data & PORT_TX_ENABLE)
-               dev->tx_ports |= (1 << port);
-       else
-               dev->tx_ports &= ~(1 << port);
-
        /* Port membership may share register with STP state. */
        if (member >= 0 && member != p->member)
                ksz9477_cfg_port_member(dev, port, (u8)member);
@@ -1092,7 +1083,7 @@ static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)
                interface = PHY_INTERFACE_MODE_GMII;
                if (gbit)
                        break;
-               /* fall through */
+               fallthrough;
        case 0:
                interface = PHY_INTERFACE_MODE_MII;
                break;
@@ -1251,18 +1242,10 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)
                p->phydev.duplex = 1;
        }
        mutex_lock(&dev->dev_mutex);
-       if (cpu_port) {
+       if (cpu_port)
                member = dev->port_mask;
-               dev->on_ports = dev->host_mask;
-               dev->live_ports = dev->host_mask;
-       } else {
+       else
                member = dev->host_mask | p->vid_member;
-               dev->on_ports |= (1 << port);
-
-               /* Link was detected before port is enabled. */
-               if (p->phydev.link)
-                       dev->live_ports |= (1 << port);
-       }
        mutex_unlock(&dev->dev_mutex);
        ksz9477_cfg_port_member(dev, port, member);
 
@@ -1382,9 +1365,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = {
        .setup                  = ksz9477_setup,
        .phy_read               = ksz9477_phy_read16,
        .phy_write              = ksz9477_phy_write16,
-       .adjust_link            = ksz_adjust_link,
+       .phylink_mac_link_down  = ksz_mac_link_down,
        .port_enable            = ksz_enable_port,
-       .port_disable           = ksz_disable_port,
        .get_strings            = ksz9477_get_strings,
        .get_ethtool_stats      = ksz_get_ethtool_stats,
        .get_sset_count         = ksz_sset_count,