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: Prasanna Vengateshan <prasanna.vengateshan@microchip.com>
Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 251048ffd3d4990480ff9ffeb23eb26f73816925..d6162b00e4fb216e2131a27ee815afe400c79335 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -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)

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 7cffc3388106c1d3b99ac0feede3bd202d440b66..22ef56e2cb7b088fd61b988c23d08d0372bf0b54 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -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,

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index c0acb12fab6d640ff4b1f74c378e5f60e85f10c5..873a6469934f45a4a70916c0e3495cc432b40f9d 100644 (file)
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -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);