net: dsa: microchip: ksz8795: use mib_cnt where possible

The variable mib_cnt is assigned with TOTAL_SWITCH_COUNTER_NUM. This
value can also be derived from the array size of mib_names. This patch
uses this calculated value instead, removes the extra define and uses
mib_cnt everywhere possible instead of the static define
TOTAL_SWITCH_COUNTER_NUM. Keeping it in a separate variable instead of
using ARRAY_SIZE everywhere instead makes the driver more flexible for
future use of devices with different amount of counters.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 04a571b..abdfc7f 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -23,7 +23,7 @@
 
 static const struct {
        char string[ETH_GSTRING_LEN];
-} mib_names[TOTAL_SWITCH_COUNTER_NUM] = {
+} mib_names[] = {
        { "rx_hi" },
        { "rx_undersize" },
        { "rx_fragments" },
@@ -654,9 +654,10 @@ static enum dsa_tag_protocol ksz8795_get_tag_protocol(struct dsa_switch *ds,
 static void ksz8795_get_strings(struct dsa_switch *ds, int port,
                                u32 stringset, uint8_t *buf)
 {
+       struct ksz_device *dev = ds->priv;
        int i;
 
-       for (i = 0; i < TOTAL_SWITCH_COUNTER_NUM; i++) {
+       for (i = 0; i < dev->mib_cnt; i++) {
                memcpy(buf + i * ETH_GSTRING_LEN, mib_names[i].string,
                       ETH_GSTRING_LEN);
        }
@@ -1236,7 +1237,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
        dev->port_mask |= dev->host_mask;
 
        dev->reg_mib_cnt = KSZ8795_COUNTER_NUM;
-       dev->mib_cnt = TOTAL_SWITCH_COUNTER_NUM;
+       dev->mib_cnt = ARRAY_SIZE(mib_names);
 
        dev->mib_port_cnt = TOTAL_PORT_NUM;
        dev->phy_port_cnt = SWITCH_PORT_NUM;
@@ -1254,7 +1255,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
                dev->ports[i].mib.counters =
                        devm_kzalloc(dev->dev,
                                     sizeof(u64) *
-                                    (TOTAL_SWITCH_COUNTER_NUM + 1),
+                                    (dev->mib_cnt + 1),
                                     GFP_KERNEL);
                if (!dev->ports[i].mib.counters)
                        return -ENOMEM;

diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h
index 2584071..c131224 100644 (file)
--- a/drivers/net/dsa/microchip/ksz8795_reg.h
+++ b/drivers/net/dsa/microchip/ksz8795_reg.h
@@ -852,9 +852,6 @@
 #define SWITCH_PORT_NUM                        (TOTAL_PORT_NUM - 1)
 
 #define KSZ8795_COUNTER_NUM            0x20
-#define TOTAL_KSZ8795_COUNTER_NUM      (KSZ8795_COUNTER_NUM + 4)
-
-#define TOTAL_SWITCH_COUNTER_NUM       TOTAL_KSZ8795_COUNTER_NUM
 
 /* Common names used by other drivers */