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

net: dsa: seville: duplicate vsc9959_mdio_bus_free 



While we don't plan on making any changes to this function, currently
this is the only remaining dependency between felix and seville, after
the PCS has been refactored out into pcs-lynx.c.

Duplicate this function in seville to break the dependency completely.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8320ec1

drivers/net/dsa/ocelot/felix.h

+0 −2
Original line number Diff line number Diff line
@@ -55,6 +55,4 @@ struct felix { 
	resource_size_t			imdio_base;

};



void vsc9959_mdio_bus_free(struct ocelot *ocelot);



#endif

drivers/net/dsa/ocelot/felix_vsc9959.c

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot) 
	return 0;

}



void vsc9959_mdio_bus_free(struct ocelot *ocelot)

static void vsc9959_mdio_bus_free(struct ocelot *ocelot)

{

	struct felix *felix = ocelot_to_felix(ocelot);

	int port;

drivers/net/dsa/ocelot/seville_vsc9953.c

+18 −1
Original line number Diff line number Diff line
@@ -981,6 +981,23 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot) 
	return 0;

}



static void vsc9953_mdio_bus_free(struct ocelot *ocelot)

{

	struct felix *felix = ocelot_to_felix(ocelot);

	int port;



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

		struct lynx_pcs *pcs = felix->pcs[port];



		if (!pcs)

			continue;



		mdio_device_free(pcs->mdio);

		lynx_pcs_destroy(pcs);

	}

	mdiobus_unregister(felix->imdio);

}



static void vsc9953_xmit_template_populate(struct ocelot *ocelot, int port)

{

	struct ocelot_port *ocelot_port = ocelot->ports[port];
@@ -1014,7 +1031,7 @@ static const struct felix_info seville_info_vsc9953 = { 
	.num_mact_rows		= 2048,

	.num_ports		= 10,

	.mdio_bus_alloc		= vsc9953_mdio_bus_alloc,

	.mdio_bus_free		= vsc9959_mdio_bus_free,

	.mdio_bus_free		= vsc9953_mdio_bus_free,

	.phylink_validate	= vsc9953_phylink_validate,

	.prevalidate_phy_mode	= vsc9953_prevalidate_phy_mode,

	.xmit_template_populate	= vsc9953_xmit_template_populate,