Commit 5b7c0c32 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: ocelot: Simplify MRP deletion 



Now that the driver will always be notified that the role is deleted
before the ring is deleted, then we don't need to duplicate the logic of
cleaning the resources also in the delete function.

Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b3cb91b9

drivers/net/ethernet/mscc/ocelot_mrp.c

+0 −16
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ int ocelot_mrp_del(struct ocelot *ocelot, int port, 
		   const struct switchdev_obj_mrp *mrp)

{

	struct ocelot_port *ocelot_port = ocelot->ports[port];

	int i;



	if (!ocelot_port)

		return -EOPNOTSUPP;
@@ -162,23 +161,8 @@ int ocelot_mrp_del(struct ocelot *ocelot, int port, 
	if (ocelot_port->mrp_ring_id != mrp->ring_id)

		return 0;



	ocelot_mrp_del_vcap(ocelot, port);

	ocelot_mrp_del_vcap(ocelot, port + ocelot->num_phys_ports);



	ocelot_port->mrp_ring_id = 0;



	for (i = 0; i < ocelot->num_phys_ports; ++i) {

		ocelot_port = ocelot->ports[i];



		if (!ocelot_port)

			continue;



		if (ocelot_port->mrp_ring_id != 0)

			goto out;

	}



	ocelot_mrp_del_mac(ocelot, ocelot->ports[port]);

out:

	return 0;

}

EXPORT_SYMBOL(ocelot_mrp_del);