Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d705f07 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: Remove switchdev_ops 



Now that we have converted all possible callers to using a switchdev
notifier for attributes we do not have a need for implementing
switchdev_ops anymore, and this can be removed from all drivers the
net_device structure.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d45224d6

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+0 −3
Original line number Diff line number Diff line
@@ -3660,7 +3660,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	}

	mlxsw_sp_port->default_vlan = mlxsw_sp_port_vlan;



	mlxsw_sp_port_switchdev_init(mlxsw_sp_port);

	mlxsw_sp->ports[local_port] = mlxsw_sp_port;

	err = register_netdev(dev);

	if (err) {
@@ -3677,7 +3676,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port, 


err_register_netdev:

	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_destroy(mlxsw_sp_port_vlan);

err_port_vlan_create:

err_port_pvid_set:
@@ -3720,7 +3718,6 @@ static void mlxsw_sp_port_remove(struct mlxsw_sp *mlxsw_sp, u8 local_port) 
	mlxsw_core_port_clear(mlxsw_sp->core, local_port, mlxsw_sp);

	unregister_netdev(mlxsw_sp_port->dev); /* This calls ndo_stop */

	mlxsw_sp->ports[local_port] = NULL;

	mlxsw_sp_port_switchdev_fini(mlxsw_sp_port);

	mlxsw_sp_port_vlan_flush(mlxsw_sp_port, true);

	mlxsw_sp_port_nve_fini(mlxsw_sp_port);

	mlxsw_sp_tc_qdisc_fini(mlxsw_sp_port);

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+0 −2
Original line number Diff line number Diff line
@@ -407,8 +407,6 @@ extern const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals; 
/* spectrum_switchdev.c */

int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port);

void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port);

int mlxsw_sp_rif_fdb_op(struct mlxsw_sp *mlxsw_sp, const char *mac, u16 fid,

			bool adding);

void

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+0 −12
Original line number Diff line number Diff line
@@ -1938,10 +1938,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, 
	return NULL;

}



static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = {

	.switchdev_port_attr_set	= mlxsw_sp_port_attr_set,

};



static int

mlxsw_sp_bridge_8021q_port_join(struct mlxsw_sp_bridge_device *bridge_device,

				struct mlxsw_sp_bridge_port *bridge_port,
@@ -3545,11 +3541,3 @@ void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp) 
	kfree(mlxsw_sp->bridge);

}

void mlxsw_sp_port_switchdev_init(struct mlxsw_sp_port *mlxsw_sp_port)

{

	mlxsw_sp_port->dev->switchdev_ops = &mlxsw_sp_port_switchdev_ops;

}



void mlxsw_sp_port_switchdev_fini(struct mlxsw_sp_port *mlxsw_sp_port)

{

}

drivers/net/ethernet/mscc/ocelot.c

+0 −5
Original line number Diff line number Diff line
@@ -1324,10 +1324,6 @@ static int ocelot_port_obj_del(struct net_device *dev, 
	return ret;

}



static const struct switchdev_ops ocelot_port_switchdev_ops = {

	.switchdev_port_attr_set	= ocelot_port_attr_set,

};



static int ocelot_port_bridge_join(struct ocelot_port *ocelot_port,

				   struct net_device *bridge)

{
@@ -1660,7 +1656,6 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, 


	dev->netdev_ops = &ocelot_port_netdev_ops;

	dev->ethtool_ops = &ocelot_ethtool_ops;

	dev->switchdev_ops = &ocelot_port_switchdev_ops;



	dev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXFCS;

	dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;

drivers/net/ethernet/rocker/rocker_main.c

+0 −5
Original line number Diff line number Diff line
@@ -2142,10 +2142,6 @@ static int rocker_port_obj_del(struct net_device *dev, 
	return err;

}



static const struct switchdev_ops rocker_port_switchdev_ops = {

	.switchdev_port_attr_set	= rocker_port_attr_set,

};



struct rocker_fib_event_work {

	struct work_struct work;

	union {
@@ -2599,7 +2595,6 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) 
	rocker_port_dev_addr_init(rocker_port);

	dev->netdev_ops = &rocker_port_netdev_ops;

	dev->ethtool_ops = &rocker_port_ethtool_ops;

	dev->switchdev_ops = &rocker_port_switchdev_ops;

	netif_tx_napi_add(dev, &rocker_port->napi_tx, rocker_port_poll_tx,

			  NAPI_POLL_WEIGHT);

	netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx,