Revert "net: dsa: microchip: set the correct number of ports"

This reverts commit d55dad8b1d893fae0c4e778abf2ace048bcbad86.

Upstream commit af199a1a9cb0 ("net: dsa: microchip: set the correct
number of ports") seems to have been applied twice on top of the 5.4
branch. This revert the second instance of said commit.

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 8d50aacd19e5126ddce83b0af31857f1753d3a62..84c4319e3b31f1e38aed496df71bbc76650a6dd4 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1270,9 +1270,6 @@ static int ksz8795_switch_init(struct ksz_device *dev)
        /* set the real number of ports */
        dev->ds->num_ports = dev->port_cnt;
 
-       /* set the real number of ports */
-       dev->ds->num_ports = dev->port_cnt;
-
        return 0;
 }
 

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index b15da9a8e3bb9782ac0ea0d6a5526be78e15f909..49ab1346dc3f75d6661721a199412a9199df592b 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -515,9 +515,6 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port,
                             PORT_VLAN_LOOKUP_VID_0, false);
        }
 
-       /* set the real number of ports */
-       dev->ds->num_ports = dev->port_cnt;
-
        return 0;
 }