Commit 008db08b authored by Arun Ramadoss's avatar Arun Ramadoss Committed by David S. Miller
Browse files

net: dsa: microchip: remove unused members in ksz_device 



The name, regs_size and overrides members in struct ksz_device are
unused. Hence remove it.
And host_mask is used in only place of ksz8795.c file, which can be
replaced by dev->info->cpu_ports

Signed-off-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65ac79e1

drivers/net/dsa/microchip/ksz8795.c

+1 −2
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static int ksz8_setup(struct dsa_switch *ds) 
	ether_addr_copy(alu.mac, eth_stp_addr);

	alu.is_static = true;

	alu.is_override = true;

	alu.port_forward = dev->host_mask;

	alu.port_forward = dev->info->cpu_ports;



	ksz8_w_sta_mac_table(dev, 0, &alu);
@@ -1476,7 +1476,6 @@ static int ksz8_switch_init(struct ksz_device *dev) 
	dev->ds->ops = &ksz8_switch_ops;



	dev->cpu_port = fls(dev->info->cpu_ports) - 1;

	dev->host_mask = dev->info->cpu_ports;

	dev->phy_port_cnt = dev->info->port_cnt - 1;

	dev->port_mask = (BIT(dev->phy_port_cnt) - 1) | dev->info->cpu_ports;

drivers/net/dsa/microchip/ksz_common.h

+0 −4
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct ksz_port { 
struct ksz_device {

	struct dsa_switch *ds;

	struct ksz_platform_data *pdata;

	const char *name;

	const struct ksz_chip_data *info;



	struct mutex dev_mutex;		/* device access */
@@ -94,7 +93,6 @@ struct ksz_device { 
	int cpu_port;			/* port connected to CPU */

	int phy_port_cnt;

	phy_interface_t compat_interface;

	u32 regs_size;

	bool synclko_125;

	bool synclko_disable;
@@ -106,8 +104,6 @@ struct ksz_device { 
	u16 mirror_rx;

	u16 mirror_tx;

	u32 features;			/* chip specific features */

	u32 overrides;			/* chip functions set by user */

	u16 host_mask;

	u16 port_mask;

};