diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 5c4f57cfa7858..8d8d46778f7e6 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -105,11 +105,9 @@
 #define REG_RESERVED_ADDR		0xffffffff
 #define REG_RESERVED(reg)		REG(reg, REG_RESERVED_ADDR)
 
-#define OCELOT_STAT_FLAG_END		BIT(0)
-
 #define for_each_stat(ocelot, stat)				\
-	for ((stat) = ocelot->stats_layout;			\
-	     !((stat)->flags & OCELOT_STAT_FLAG_END);		\
+	for ((stat) = (ocelot)->stats_layout;			\
+	     ((stat)->name[0] != '\0');				\
 	     (stat)++)
 
 enum ocelot_target {
@@ -542,11 +540,10 @@ enum ocelot_ptp_pins {
 
 struct ocelot_stat_layout {
 	u32 offset;
-	u32 flags;
 	char name[ETH_GSTRING_LEN];
 };
 
-#define OCELOT_STAT_END { .flags = OCELOT_STAT_FLAG_END }
+#define OCELOT_STAT_END { .name = "" }
 
 struct ocelot_stats_region {
 	struct list_head node;