Remove slightly used const values that can be replaced with nitems().

Suggested by:	jhb

4 files changed, 8 insertions, 18 deletions

diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
index f092a21..a54ac27 100644
--- a/sys/dev/hwpmc/hwpmc_core.c
+++ b/sys/dev/hwpmc/hwpmc_core.c
@@ -1894,8 +1894,6 @@ static struct iap_event_descr iap_events[] = {
     IAPDESCR(FDH_40H, 0xFD, 0x40, IAP_F_FM | IAP_F_WM | IAP_F_I7),
 };
 
-static const int niap_events = sizeof(iap_events) / sizeof(iap_events[0]);
-
 static pmc_value_t
 iap_perfctr_value_to_reload_count(pmc_value_t v)
 {
@@ -2251,11 +2249,11 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm,
 		break;
 	}
 
-	for (n = 0, ie = iap_events; n < niap_events; n++, ie++)
+	for (n = 0, ie = iap_events; n < nitems(iap_events); n++, ie++)
 		if (ie->iap_ev == ev && ie->iap_flags & cpuflag)
 			break;
 
-	if (n == niap_events)
+	if (n == nitems(iap_events))
 		return (EINVAL);
 
 	/*
diff --git a/sys/dev/hwpmc/hwpmc_mpc7xxx.c b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
index 296bd37..2a2b608 100644
--- a/sys/dev/hwpmc/hwpmc_mpc7xxx.c
+++ b/sys/dev/hwpmc/hwpmc_mpc7xxx.c
@@ -311,9 +311,6 @@ static struct mpc7xxx_event_code_map mpc7xxx_event_codes[] = {
 	PMC_POWERPC_EVENT(PREFETCH_ENGINE_FULL, 0x20, 57)
 };
 
-const size_t mpc7xxx_event_codes_size = 
-	sizeof(mpc7xxx_event_codes) / sizeof(mpc7xxx_event_codes[0]);
-
 static pmc_value_t
 mpc7xxx_pmcn_read(unsigned int pmc)
 {
@@ -616,14 +613,14 @@ mpc7xxx_allocate_pmc(int cpu, int ri, struct pmc *pm,
 	caps = a->pm_caps;
 
 	pe = a->pm_ev;
-	for (i = 0; i < mpc7xxx_event_codes_size; i++) {
+	for (i = 0; i < nitems(mpc7xxx_event_codes); i++) {
 		if (mpc7xxx_event_codes[i].pe_ev == pe) {
 			config = mpc7xxx_event_codes[i].pe_code;
 			counter =  mpc7xxx_event_codes[i].pe_counter_mask;
 			break;
 		}
 	}
-	if (i == mpc7xxx_event_codes_size)
+	if (i == nitems(mpc7xxx_event_codes))
 		return (EINVAL);
 
 	if ((counter & (1 << ri)) == 0)
diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c
index 2b24b33e..7050927 100644
--- a/sys/dev/hwpmc/hwpmc_uncore.c
+++ b/sys/dev/hwpmc/hwpmc_uncore.c
@@ -790,8 +790,6 @@ static struct ucp_event_descr ucp_events[] = {
     UCPDESCR(86H_01H, 0x86, 0x01, UCP_F_FM | UCP_F_WM)
 };
 
-static const int nucp_events = sizeof(ucp_events) / sizeof(ucp_events[0]);
-
 static pmc_value_t
 ucp_perfctr_value_to_reload_count(pmc_value_t v)
 {
@@ -883,11 +881,11 @@ ucp_allocate_pmc(int cpu, int ri, struct pmc *pm,
 		return (EINVAL);
 	}
 
-	for (n = 0, ie = ucp_events; n < nucp_events; n++, ie++)
+	for (n = 0, ie = ucp_events; n < nitems(ucp_events); n++, ie++)
 		if (ie->ucp_ev == ev && ie->ucp_flags & cpuflag)
 			break;
 
-	if (n == nucp_events)
+	if (n == nitems(ucp_events))
 		return (EINVAL);
 
 	/*
diff --git a/sys/dev/hwpmc/hwpmc_xscale.c b/sys/dev/hwpmc/hwpmc_xscale.c
index e5df8d0..4a03ea6 100644
--- a/sys/dev/hwpmc/hwpmc_xscale.c
+++ b/sys/dev/hwpmc/hwpmc_xscale.c
@@ -88,9 +88,6 @@ const struct xscale_event_code_map xscale_event_codes[] = {
 	{ PMC_EV_XSCALE_DATA_BUS_TRANS,		0x48 },
 };
 
-const int xscale_event_codes_size =
-	sizeof(xscale_event_codes) / sizeof(xscale_event_codes[0]);
-
 /*
  * Per-processor information.
  */
@@ -264,13 +261,13 @@ xscale_allocate_pmc(int cpu, int ri, struct pmc *pm,
 	if (a->pm_class != PMC_CLASS_XSCALE)
 		return (EINVAL);
 	pe = a->pm_ev;
-	for (i = 0; i < xscale_event_codes_size; i++) {
+	for (i = 0; i < nitems(xscale_event_codes); i++) {
 		if (xscale_event_codes[i].pe_ev == pe) {
 			config = xscale_event_codes[i].pe_code;
 			break;
 		}
 	}
-	if (i == xscale_event_codes_size)
+	if (i == nitems(xscale_event_codes))
 		return EINVAL;
 	/* Generation 1 has fewer events */
 	if (xscale_gen == 1 && i > PMC_EV_XSCALE_PC_CHANGE)