net: dsa: felix: remove ocelot->npi assignment from felix_8021q_cpu_port_init

This assignment is redundant, since ocelot->npi has already been set to
-1 by felix_npi_port_deinit(). Call path:

felix_change_tag_protocol
-> felix_del_tag_protocol(DSA_TAG_PROTO_OCELOT)
   -> felix_teardown_tag_npi
      -> felix_npi_port_deinit
-> felix_set_tag_protocol(DSA_TAG_PROTO_OCELOT_8021Q)
   -> felix_setup_tag_8021q
      -> felix_8021q_cpu_port_init

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 638f420bf599c2e97bfd2bf8d9efc138b88615e1..7db1169a418bbcfe426e5d6466243ca5c5c442e5 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -370,7 +370,6 @@ static void felix_8021q_cpu_port_init(struct ocelot *ocelot, int port)
        mutex_lock(&ocelot->fwd_domain_lock);
 
        ocelot_port_set_dsa_8021q_cpu(ocelot, port);
-       ocelot->npi = -1;
 
        /* Overwrite PGID_CPU with the non-tagging port */
        ocelot_write_rix(ocelot, BIT(port), ANA_PGID_PGID, PGID_CPU);