net: mscc: ocelot: harmonize names of SYS_COUNT_TX_AGING and OCELOT_STAT_TX_AGED

The hardware counter is called C_TX_AGED, so rename SYS_COUNT_TX_AGING
to SYS_COUNT_TX_AGED. This will become important since we want to
minimize the way in which we declare struct ocelot_stat_layout elements,
using the C preprocessor.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index b815bc4278d96252139ac6aca93b09981d3f7a01..e1c5bcb5432dd730466600eea363f196d29313f0 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -348,7 +348,7 @@ static const u32 vsc9959_sys_regmap[] = {
        REG(SYS_COUNT_TX_GREEN_PRIO_5,          0x00026c),
        REG(SYS_COUNT_TX_GREEN_PRIO_6,          0x000270),
        REG(SYS_COUNT_TX_GREEN_PRIO_7,          0x000274),
-       REG(SYS_COUNT_TX_AGING,                 0x000278),
+       REG(SYS_COUNT_TX_AGED,                  0x000278),
        REG(SYS_COUNT_DROP_LOCAL,               0x000400),
        REG(SYS_COUNT_DROP_TAIL,                0x000404),
        REG(SYS_COUNT_DROP_YELLOW_PRIO_0,       0x000408),
@@ -921,7 +921,7 @@ static const struct ocelot_stat_layout vsc9959_stats_layout[OCELOT_NUM_STATS] =
        },
        [OCELOT_STAT_TX_AGED] = {
                .name = "tx_aged",
-               .reg = SYS_COUNT_TX_AGING,
+               .reg = SYS_COUNT_TX_AGED,
        },
        [OCELOT_STAT_DROP_LOCAL] = {
                .name = "drop_local",

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 26fdd0d90724e678b4d5d4227f213e5fc92ee866..5799c4e50e362545241112c6b7ba786697e871e7 100644 (file)
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -343,7 +343,7 @@ static const u32 vsc9953_sys_regmap[] = {
        REG(SYS_COUNT_TX_GREEN_PRIO_5,          0x00016c),
        REG(SYS_COUNT_TX_GREEN_PRIO_6,          0x000170),
        REG(SYS_COUNT_TX_GREEN_PRIO_7,          0x000174),
-       REG(SYS_COUNT_TX_AGING,                 0x000178),
+       REG(SYS_COUNT_TX_AGED,                  0x000178),
        REG(SYS_COUNT_DROP_LOCAL,               0x000200),
        REG(SYS_COUNT_DROP_TAIL,                0x000204),
        REG(SYS_COUNT_DROP_YELLOW_PRIO_0,       0x000208),
@@ -912,7 +912,7 @@ static const struct ocelot_stat_layout vsc9953_stats_layout[OCELOT_NUM_STATS] =
        },
        [OCELOT_STAT_TX_AGED] = {
                .name = "tx_aged",
-               .reg = SYS_COUNT_TX_AGING,
+               .reg = SYS_COUNT_TX_AGED,
        },
        [OCELOT_STAT_DROP_LOCAL] = {
                .name = "drop_local",

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 9c488953f541daa12e5c9d26676efae241ed1002..fc1c890e3db1a38cbdd7b419673dcd29438044b8 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -395,7 +395,7 @@ static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STATS] = {
        },
        [OCELOT_STAT_TX_AGED] = {
                .name = "tx_aged",
-               .reg = SYS_COUNT_TX_AGING,
+               .reg = SYS_COUNT_TX_AGED,
        },
        [OCELOT_STAT_DROP_LOCAL] = {
                .name = "drop_local",

diff --git a/drivers/net/ethernet/mscc/vsc7514_regs.c b/drivers/net/ethernet/mscc/vsc7514_regs.c
index bd062203a6b26b78bc4f13b8c21edb129e277725..9d2d3e13cacfa21d9fc3f97120a50bbedd77e7f8 100644 (file)
--- a/drivers/net/ethernet/mscc/vsc7514_regs.c
+++ b/drivers/net/ethernet/mscc/vsc7514_regs.c
@@ -242,7 +242,7 @@ const u32 vsc7514_sys_regmap[] = {
        REG(SYS_COUNT_TX_GREEN_PRIO_5,                  0x00016c),
        REG(SYS_COUNT_TX_GREEN_PRIO_6,                  0x000170),
        REG(SYS_COUNT_TX_GREEN_PRIO_7,                  0x000174),
-       REG(SYS_COUNT_TX_AGING,                         0x000178),
+       REG(SYS_COUNT_TX_AGED,                          0x000178),
        REG(SYS_COUNT_DROP_LOCAL,                       0x000200),
        REG(SYS_COUNT_DROP_TAIL,                        0x000204),
        REG(SYS_COUNT_DROP_YELLOW_PRIO_0,               0x000208),

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 050e142518e6be2fefc183734e49d490f1a36824..860ec592c689670620c05f178c9ec38c21670270 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -392,7 +392,7 @@ enum ocelot_reg {
        SYS_COUNT_TX_GREEN_PRIO_5,
        SYS_COUNT_TX_GREEN_PRIO_6,
        SYS_COUNT_TX_GREEN_PRIO_7,
-       SYS_COUNT_TX_AGING,
+       SYS_COUNT_TX_AGED,
        SYS_COUNT_DROP_LOCAL,
        SYS_COUNT_DROP_TAIL,
        SYS_COUNT_DROP_YELLOW_PRIO_0,