[PATCH v2 1/6] net: dsa: microchip: delete unused member ksz_port.phy

[Helmut Grohne]

Link: https://lore.kernel.org/netdev/20200721083300.GA12970@laureti-dev/
Signed-off-by: Helmut Grohne <helmut.gro...@intenta.de>
---
 drivers/net/dsa/microchip/ksz8795.c    | 1 -
 drivers/net/dsa/microchip/ksz9477.c    | 8 +-------
 drivers/net/dsa/microchip/ksz_common.h | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz8795.c 
b/drivers/net/dsa/microchip/ksz8795.c
index 8f1d15ea15d9..e62d54306765 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1007,7 +1007,6 @@ static void ksz8795_config_cpu_port(struct dsa_switch *ds)
                if (i == dev->port_cnt)
                        break;
                p->on = 1;
-               p->phy = 1;
        }
        for (i = 0; i < dev->phy_port_cnt; i++) {
                p = &dev->ports[i];
diff --git a/drivers/net/dsa/microchip/ksz9477.c 
b/drivers/net/dsa/microchip/ksz9477.c
index dc999406ce86..c548894553bc 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -1305,14 +1305,8 @@ static void ksz9477_config_cpu_port(struct dsa_switch 
*ds)
                p->member = dev->port_mask;
                ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED);
                p->on = 1;
-               if (i < dev->phy_port_cnt)
-                       p->phy = 1;
-               if (dev->chip_id == 0x00947700 && i == 6) {
+               if (dev->chip_id == 0x00947700 && i == 6)
                        p->sgmii = 1;
-
-                       /* SGMII PHY detection code is not implemented yet. */
-                       p->phy = 0;
-               }
        }
 }
 
diff --git a/drivers/net/dsa/microchip/ksz_common.h 
b/drivers/net/dsa/microchip/ksz_common.h
index 206838160f49..0432cd38bf0b 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -31,7 +31,6 @@ struct ksz_port {
        struct phy_device phydev;
 
        u32 on:1;                       /* port is not disabled by hardware */
-       u32 phy:1;                      /* port has a PHY */
        u32 fiber:1;                    /* port is fiber */
        u32 sgmii:1;                    /* port is SGMII */
        u32 force:1;
-- 
2.20.1