Commit b094c679 authored by Prasanna Vengateshan's avatar Prasanna Vengateshan Committed by David S. Miller
Browse files

net: dsa: move mib->cnt_ptr reset code to ksz_common.c 



mib->cnt_ptr resetting is handled in multiple places as part of
port_init_cnt(). Hence moved mib->cnt_ptr code to ksz common layer
and removed from individual product files.

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

drivers/net/dsa/microchip/ksz8795.c

+0 −2
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ static void ksz8_port_init_cnt(struct ksz_device *dev, int port) 
					dropped, &mib->counters[mib->cnt_ptr]);

		++mib->cnt_ptr;

	}

	mib->cnt_ptr = 0;

	memset(mib->counters, 0, dev->info->mib_cnt * sizeof(u64));

}



static void ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data)

drivers/net/dsa/microchip/ksz9477.c

+0 −3
Original line number Diff line number Diff line
@@ -274,9 +274,6 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port) 
	ksz_write8(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FLUSH);

	ksz_pwrite32(dev, port, REG_PORT_MIB_CTRL_STAT__4, 0);

	mutex_unlock(&mib->cnt_mutex);



	mib->cnt_ptr = 0;

	memset(mib->counters, 0, dev->info->mib_cnt * sizeof(u64));

}



static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,

drivers/net/dsa/microchip/ksz_common.c

+7 −1
Original line number Diff line number Diff line
@@ -560,8 +560,14 @@ void ksz_init_mib_timer(struct ksz_device *dev) 


	INIT_DELAYED_WORK(&dev->mib_read, ksz_mib_read_work);



	for (i = 0; i < dev->info->port_cnt; i++)

	for (i = 0; i < dev->info->port_cnt; i++) {

		struct ksz_port_mib *mib = &dev->ports[i].mib;



		dev->dev_ops->port_init_cnt(dev, i);



		mib->cnt_ptr = 0;

		memset(mib->counters, 0, dev->info->mib_cnt * sizeof(u64));

	}

}

EXPORT_SYMBOL_GPL(ksz_init_mib_timer);