Commit 28c1305b authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3cde44f

drivers/net/dsa/ocelot/felix.c

+0 −1
Original line number Diff line number Diff line
@@ -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);