Commit e1ff0bd6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ocelot-stats-improvement' 

Colin Foster says:

====================
ocelot stats improvement

A couple of pick-ups after f187bfa6f35 ("net: ethernet: ocelot: remove
the need for num_stats initializer") - one addresses a warning
patchwork flagged about operator precedence when using macro arguments.
The other is a reduction of unnecessary memory allocation.
====================

Link: https://lore.kernel.org/r/20220430232327.4091825-1-colin.foster@in-advantage.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c5f50500 8c5b07da

include/soc/mscc/ocelot.h

+3 −6
Original line number Diff line number Diff line
@@ -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;