summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-02-12 17:31:30 -0800
committerDavid S. Miller <davem@davemloft.net>2019-02-12 17:31:30 -0800
commitd2d37444e5603b9f6121905fab7d8e859ed0c59d (patch)
tree2e50254f28f039f46e03a3dabcaed2b3977d1409
parentbd3606c29fccd0fe3d1061a61811cabf1abf7110 (diff)
parentfd80a14363eec09cef018dc8a1074efc298a0a07 (diff)
downloadlwn-d2d37444e5603b9f6121905fab7d8e859ed0c59d.tar.gz
lwn-d2d37444e5603b9f6121905fab7d8e859ed0c59d.zip
Merge branch 'net-Remove-unused-variables'
Florian Fainelli says: ==================== Remove unused variables This removes unused variables from mlxsw and ethsw after the recent removal of SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, build scripts are now fixed to take care of those warnings :). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c3
-rw-r--r--drivers/staging/fsl-dpaa2/ethsw/ethsw.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 4c5780f8f4b2..1f492b7dbea8 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -434,9 +434,6 @@ static void mlxsw_sp_bridge_vlan_put(struct mlxsw_sp_bridge_vlan *bridge_vlan)
static int mlxsw_sp_port_attr_get(struct net_device *dev,
struct switchdev_attr *attr)
{
- struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
- struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
-
switch (attr->id) {
case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:
attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD |
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index e5a14c7c777f..1b3943b71254 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -643,8 +643,6 @@ static void ethsw_teardown_irqs(struct fsl_mc_device *sw_dev)
static int swdev_port_attr_get(struct net_device *netdev,
struct switchdev_attr *attr)
{
- struct ethsw_port_priv *port_priv = netdev_priv(netdev);
-
switch (attr->id) {
case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:
attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD;