Commit b20a6b29 authored by Codrin Ciubotariu's avatar Codrin Ciubotariu Committed by David S. Miller
Browse files

net: dsa: microchip: remove unused private members 



Private structure members live_ports, on_ports, rx_ports, tx_ports are
initialized but not used anywhere. Let's remove them.

Suggested-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 143a102e

drivers/net/dsa/microchip/ksz8795.c

+0 −18
Original line number Diff line number Diff line
@@ -731,15 +731,6 @@ static void ksz8795_port_stp_state_set(struct dsa_switch *ds, int port, 


	ksz_pwrite8(dev, port, P_STP_CTRL, data);

	p->stp_state = state;

	if (data & PORT_RX_ENABLE)

		dev->rx_ports |= BIT(port);

	else

		dev->rx_ports &= ~BIT(port);

	if (data & PORT_TX_ENABLE)

		dev->tx_ports |= BIT(port);

	else

		dev->tx_ports &= ~BIT(port);



	/* Port membership may share register with STP state. */

	if (member >= 0 && member != p->member)

		ksz8795_cfg_port_member(dev, port, (u8)member);
@@ -976,15 +967,8 @@ static void ksz8795_port_setup(struct ksz_device *dev, int port, bool cpu_port) 
		p->phydev.duplex = 1;



		member = dev->port_mask;

		dev->on_ports = dev->host_mask;

		dev->live_ports = dev->host_mask;

	} else {

		member = dev->host_mask | p->vid_member;

		dev->on_ports |= BIT(port);



		/* Link was detected before port is enabled. */

		if (p->phydev.link)

			dev->live_ports |= BIT(port);

	}

	ksz8795_cfg_port_member(dev, port, member);

}
@@ -1112,9 +1096,7 @@ static const struct dsa_switch_ops ksz8795_switch_ops = { 
	.phy_read		= ksz_phy_read16,

	.phy_write		= ksz_phy_write16,

	.phylink_mac_link_down	= ksz_mac_link_down,

	.phylink_mac_link_up	= ksz_mac_link_up,

	.port_enable		= ksz_enable_port,

	.port_disable		= ksz_disable_port,

	.get_strings		= ksz8795_get_strings,

	.get_ethtool_stats	= ksz_get_ethtool_stats,

	.get_sset_count		= ksz_sset_count,

drivers/net/dsa/microchip/ksz9477.c

+2 −21
Original line number Diff line number Diff line
@@ -452,15 +452,6 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port, 
	ksz_pwrite8(dev, port, P_STP_CTRL, data);

	p->stp_state = state;

	mutex_lock(&dev->dev_mutex);

	if (data & PORT_RX_ENABLE)

		dev->rx_ports |= (1 << port);

	else

		dev->rx_ports &= ~(1 << port);

	if (data & PORT_TX_ENABLE)

		dev->tx_ports |= (1 << port);

	else

		dev->tx_ports &= ~(1 << port);



	/* Port membership may share register with STP state. */

	if (member >= 0 && member != p->member)

		ksz9477_cfg_port_member(dev, port, (u8)member);
@@ -1268,18 +1259,10 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port) 
		p->phydev.duplex = 1;

	}

	mutex_lock(&dev->dev_mutex);

	if (cpu_port) {

	if (cpu_port)

		member = dev->port_mask;

		dev->on_ports = dev->host_mask;

		dev->live_ports = dev->host_mask;

	} else {

	else

		member = dev->host_mask | p->vid_member;

		dev->on_ports |= (1 << port);



		/* Link was detected before port is enabled. */

		if (p->phydev.link)

			dev->live_ports |= (1 << port);

	}

	mutex_unlock(&dev->dev_mutex);

	ksz9477_cfg_port_member(dev, port, member);
@@ -1400,9 +1383,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { 
	.phy_read		= ksz9477_phy_read16,

	.phy_write		= ksz9477_phy_write16,

	.phylink_mac_link_down	= ksz_mac_link_down,

	.phylink_mac_link_up	= ksz_mac_link_up,

	.port_enable		= ksz_enable_port,

	.port_disable		= ksz_disable_port,

	.get_strings		= ksz9477_get_strings,

	.get_ethtool_stats	= ksz_get_ethtool_stats,

	.get_sset_count		= ksz_sset_count,

drivers/net/dsa/microchip/ksz_common.c

+0 −33
Original line number Diff line number Diff line
@@ -144,26 +144,9 @@ void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode, 
	/* Read all MIB counters when the link is going down. */

	p->read = true;

	schedule_delayed_work(&dev->mib_read, 0);



	mutex_lock(&dev->dev_mutex);

	dev->live_ports &= ~(1 << port);

	mutex_unlock(&dev->dev_mutex);

}

EXPORT_SYMBOL_GPL(ksz_mac_link_down);



void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,

		     phy_interface_t interface, struct phy_device *phydev,

		     int speed, int duplex, bool tx_pause, bool rx_pause)

{

	struct ksz_device *dev = ds->priv;



	/* Remember which port is connected and active. */

	mutex_lock(&dev->dev_mutex);

	dev->live_ports |= (1 << port) & dev->on_ports;

	mutex_unlock(&dev->dev_mutex);

}

EXPORT_SYMBOL_GPL(ksz_mac_link_up);



int ksz_sset_count(struct dsa_switch *ds, int port, int sset)

{

	struct ksz_device *dev = ds->priv;
@@ -377,22 +360,6 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) 
}

EXPORT_SYMBOL_GPL(ksz_enable_port);



void ksz_disable_port(struct dsa_switch *ds, int port)

{

	struct ksz_device *dev = ds->priv;



	if (!dsa_is_user_port(ds, port))

		return;



	dev->on_ports &= ~(1 << port);

	dev->live_ports &= ~(1 << port);



	/* port_stp_state_set() will be called after to disable the port so

	 * there is no need to do anything.

	 */

}

EXPORT_SYMBOL_GPL(ksz_disable_port);



struct ksz_device *ksz_switch_alloc(struct device *base, void *priv)

{

	struct dsa_switch *ds;

drivers/net/dsa/microchip/ksz_common.h

+0 −8
Original line number Diff line number Diff line
@@ -84,10 +84,6 @@ struct ksz_device { 
	unsigned long mib_read_interval;

	u16 br_member;

	u16 member;

	u16 live_ports;

	u16 on_ports;			/* ports enabled by DSA */

	u16 rx_ports;

	u16 tx_ports;

	u16 mirror_rx;

	u16 mirror_tx;

	u32 features;			/* chip specific features */
@@ -161,9 +157,6 @@ int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg); 
int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);

void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,

		       phy_interface_t interface);

void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,

		     phy_interface_t interface, struct phy_device *phydev,

		     int speed, int duplex, bool tx_pause, bool rx_pause);

int ksz_sset_count(struct dsa_switch *ds, int port, int sset);

void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf);

int ksz_port_bridge_join(struct dsa_switch *ds, int port,
@@ -182,7 +175,6 @@ void ksz_port_mdb_add(struct dsa_switch *ds, int port, 
int ksz_port_mdb_del(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_mdb *mdb);

int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);

void ksz_disable_port(struct dsa_switch *ds, int port);



/* Common register access functions */