Use our nitems() macro when param.h is available.

Replacements specific to arm, mips, pc98, powerpc and sparc64.

Discussed in:	freebsd-current

6 files changed, 11 insertions, 12 deletions

diff --git a/sys/arm/amlogic/aml8726/aml8726_clkmsr.c b/sys/arm/amlogic/aml8726/aml8726_clkmsr.c
index da75618..43faa12 100644
--- a/sys/arm/amlogic/aml8726/aml8726_clkmsr.c
+++ b/sys/arm/amlogic/aml8726/aml8726_clkmsr.c
@@ -69,8 +69,7 @@ static struct aml8726_clkmsr_clk {
 
 #define	AML_CLKMSR_CLK81	0
 
-#define	AML_CLKMSR_NCLKS	(sizeof(aml8726_clkmsr_clks) \
-    / sizeof(aml8726_clkmsr_clks[0]))
+#define	AML_CLKMSR_NCLKS	nitems(aml8726_clkmsr_clks)
 
 struct aml8726_clkmsr_softc {
 	device_t		dev;
diff --git a/sys/arm/arm/db_interface.c b/sys/arm/arm/db_interface.c
index bc49dc6..1ceb29b 100644
--- a/sys/arm/arm/db_interface.c
+++ b/sys/arm/arm/db_interface.c
@@ -100,7 +100,7 @@ struct db_variable db_regs[] = {
 	{ "irq_sp", &nil, db_access_irq_sp, },
 };
 
-struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
+struct db_variable *db_eregs = db_regs + nitems(db_regs);
 
 int
 db_access_und_sp(struct db_variable *vp, db_expr_t *valp, int rw)
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index e93e3b7..a97849b 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -320,7 +320,7 @@ at91_pmc_clock_add(const char *name, uint32_t irq,
 	else
 		clk->parent = parent;
 
-	for (i = 0; i < sizeof(clock_list) / sizeof(clock_list[0]); i++) {
+	for (i = 0; i < nitems(clock_list); i++) {
 		if (clock_list[i] == NULL) {
 			clock_list[i] = clk;
 			return (clk);
@@ -358,7 +358,7 @@ at91_pmc_clock_ref(const char *name)
 {
 	int i;
 
-	for (i = 0; i < sizeof(clock_list) / sizeof(clock_list[0]); i++) {
+	for (i = 0; i < nitems(clock_list); i++) {
 		if (clock_list[i] == NULL)
 		    break;
 		if (strcmp(name, clock_list[i]->name) == 0)
@@ -484,7 +484,7 @@ static const unsigned int at91_main_clock_tbl[] = {
 	12000000, 12288000, 13560000, 14318180, 14745600,
 	16000000, 17344700, 18432000, 20000000
 };
-#define	MAIN_CLOCK_TBL_LEN	(sizeof(at91_main_clock_tbl) / sizeof(*at91_main_clock_tbl))
+#define	MAIN_CLOCK_TBL_LEN	nitems(at91_main_clock_tbl)
 #endif
 
 static unsigned int
diff --git a/sys/arm/mv/armadaxp/armadaxp.c b/sys/arm/mv/armadaxp/armadaxp.c
index 3cb03fa..172d3d7 100644
--- a/sys/arm/mv/armadaxp/armadaxp.c
+++ b/sys/arm/mv/armadaxp/armadaxp.c
@@ -150,13 +150,13 @@ count_l2clk(void)
 	sar_fab_freq = FAB_FREQ_FIELD(sar_reg);
 
 	/* Check if CPU frequency field has correct value */
-	array_size = sizeof(cpu_clock_table) / sizeof(cpu_clock_table[0]);
+	array_size = nitems(cpu_clock_table);
 	if (sar_cpu_freq >= array_size)
 		panic("Reserved value in cpu frequency configuration field: "
 		    "%d", sar_cpu_freq);
 
 	/* Check if fabric frequency field has correct value */
-	array_size = sizeof(freq_conf_table) / sizeof(freq_conf_table[0]);
+	array_size = nitems(freq_conf_table);
 	if (sar_fab_freq >= array_size)
 		panic("Reserved value in fabric frequency configuration field: "
 		    "%d", sar_fab_freq);
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index 4486e0f..56a5dd7 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -470,7 +470,7 @@ cpsw_init_slots(struct cpsw_softc *sc)
 	STAILQ_INIT(&sc->avail);
 
 	/* Put the slot descriptors onto the global avail list. */
-	for (i = 0; i < sizeof(sc->_slots) / sizeof(sc->_slots[0]); i++) {
+	for (i = 0; i < nitems(sc->_slots); i++) {
 		slot = &sc->_slots[i];
 		slot->bd_offset = cpsw_cpdma_bd_offset(i);
 		STAILQ_INSERT_TAIL(&sc->avail, slot, next);
@@ -480,7 +480,7 @@ cpsw_init_slots(struct cpsw_softc *sc)
 static int
 cpsw_add_slots(struct cpsw_softc *sc, struct cpsw_queue *queue, int requested)
 {
-	const int max_slots = sizeof(sc->_slots) / sizeof(sc->_slots[0]);
+	const int max_slots = nitems(sc->_slots);
 	struct cpsw_slot *slot;
 	int i;
 
@@ -917,7 +917,7 @@ cpsw_detach(device_t dev)
 	cpsw_intr_detach(sc);
 
 	/* Free dmamaps and mbufs */
-	for (i = 0; i < sizeof(sc->_slots) / sizeof(sc->_slots[0]); ++i)
+	for (i = 0; i < nitems(sc->_slots); ++i)
 		cpsw_free_slot(sc, &sc->_slots[i]);
 
 	/* Free null mbuf. */
diff --git a/sys/arm/xscale/ixp425/ixp425.c b/sys/arm/xscale/ixp425/ixp425.c
index 20120e6..aca7d77 100644
--- a/sys/arm/xscale/ixp425/ixp425.c
+++ b/sys/arm/xscale/ixp425/ixp425.c
@@ -473,7 +473,7 @@ gethwvtrans(uint32_t hwbase, uint32_t size)
 	};
 	int i;
 
-	for (i = 0; i < sizeof hwvtrans / sizeof *hwvtrans; i++) {
+	for (i = 0; i < nitems(hwvtrans); i++) {
 		if (hwbase >= hwvtrans[i].hwbase &&
 		    hwbase + size <= hwvtrans[i].hwbase + hwvtrans[i].size)
 			return &hwvtrans[i];