diff options
author | pfg <pfg@FreeBSD.org> | 2016-04-21 19:40:10 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-04-21 19:40:10 +0000 |
commit | 42747553f484b2cfcfb919643e1749c9ad782766 (patch) | |
tree | eafad75827e36e967c59edef51d49100cec9cad4 | |
parent | b98e219695917390f708c219fcd6bc8938cea0e2 (diff) | |
download | FreeBSD-src-42747553f484b2cfcfb919643e1749c9ad782766.zip FreeBSD-src-42747553f484b2cfcfb919643e1749c9ad782766.tar.gz |
sys: use our nitems() macro when param.h is available.
This should cover all the remaining cases in the kernel.
Discussed in: freebsd-current
35 files changed, 70 insertions, 90 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 31750ea..535258e 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1431,7 +1431,7 @@ adaregister(struct cam_periph *periph, void *arg) */ match = cam_quirkmatch((caddr_t)&cgd->ident_data, (caddr_t)ada_quirk_table, - sizeof(ada_quirk_table)/sizeof(*ada_quirk_table), + nitems(ada_quirk_table), sizeof(*ada_quirk_table), ata_identify_match); if (match != NULL) softc->quirks = ((struct ada_quirk_entry *)match)->quirks; diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 40b6db5..67a11b7 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -154,7 +154,7 @@ static struct scsi_op_quirk_entry scsi_op_quirk_table[] = { * feel free to change this quirk entry. */ {T_CDROM, SIP_MEDIA_REMOVABLE, "PLEXTOR", "CD-ROM PX*", "*"}, - sizeof(plextor_cd_ops)/sizeof(struct op_table_entry), + nitems(plextor_cd_ops), plextor_cd_ops } }; @@ -645,8 +645,7 @@ scsi_op_desc(u_int16_t opcode, struct scsi_inquiry_data *inq_data) match = cam_quirkmatch((caddr_t)inq_data, (caddr_t)scsi_op_quirk_table, - sizeof(scsi_op_quirk_table)/ - sizeof(*scsi_op_quirk_table), + nitems(scsi_op_quirk_table), sizeof(*scsi_op_quirk_table), scsi_inquiry_match); } @@ -655,7 +654,7 @@ scsi_op_desc(u_int16_t opcode, struct scsi_inquiry_data *inq_data) table[0] = ((struct scsi_op_quirk_entry *)match)->op_table; num_ops[0] = ((struct scsi_op_quirk_entry *)match)->num_ops; table[1] = scsi_op_codes; - num_ops[1] = sizeof(scsi_op_codes)/sizeof(scsi_op_codes[0]); + num_ops[1] = nitems(scsi_op_codes); num_tables = 2; } else { /* @@ -666,7 +665,7 @@ scsi_op_desc(u_int16_t opcode, struct scsi_inquiry_data *inq_data) return("Vendor Specific Command"); table[0] = scsi_op_codes; - num_ops[0] = sizeof(scsi_op_codes)/sizeof(scsi_op_codes[0]); + num_ops[0] = nitems(scsi_op_codes); num_tables = 1; } @@ -921,7 +920,7 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = { */ {T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "FIREBALL S*", "*"}, /*num_sense_keys*/0, - sizeof(quantum_fireball_entries)/sizeof(struct asc_table_entry), + nitems(quantum_fireball_entries), /*sense key entries*/NULL, quantum_fireball_entries }, @@ -932,7 +931,7 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = { */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "SONY", "SMO-*", "*"}, /*num_sense_keys*/0, - sizeof(sony_mo_entries)/sizeof(struct asc_table_entry), + nitems(sony_mo_entries), /*sense key entries*/NULL, sony_mo_entries }, @@ -942,7 +941,7 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = { */ {T_DIRECT, SIP_MEDIA_FIXED, "HGST", "*", "*"}, /*num_sense_keys*/0, - sizeof(hgst_entries)/sizeof(struct asc_table_entry), + nitems(hgst_entries), /*sense key entries*/NULL, hgst_entries }, @@ -952,14 +951,13 @@ static struct scsi_sense_quirk_entry sense_quirk_table[] = { */ {T_DIRECT, SIP_MEDIA_FIXED, "SEAGATE", "*", "*"}, /*num_sense_keys*/0, - sizeof(seagate_entries)/sizeof(struct asc_table_entry), + nitems(seagate_entries), /*sense key entries*/NULL, seagate_entries } }; -const int sense_quirk_table_size = - sizeof(sense_quirk_table)/sizeof(sense_quirk_table[0]); +const int sense_quirk_table_size = nitems(sense_quirk_table); static struct asc_table_entry asc_table[] = { /* @@ -3195,7 +3193,7 @@ static struct asc_table_entry asc_table[] = { "Security conflict in translated device") } }; -const int asc_table_size = sizeof(asc_table)/sizeof(asc_table[0]); +const int asc_table_size = nitems(asc_table); struct asc_key { @@ -4704,8 +4702,7 @@ scsi_sense_desc_sbuf(struct sbuf *sb, struct scsi_sense_data *sense, { int i; - for (i = 0; i < (sizeof(scsi_sense_printers) / - sizeof(scsi_sense_printers[0])); i++) { + for (i = 0; i < (nitems(scsi_sense_printers)); i++) { struct scsi_sense_desc_printer *printer; printer = &scsi_sense_printers[i]; @@ -5490,7 +5487,7 @@ scsi_calc_syncsrate(u_int period_factor) return (3300); } - num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]); + num_syncrates = nitems(scsi_syncrates); /* See if the period is in the "exception" table */ for (i = 0; i < num_syncrates; i++) { @@ -5522,7 +5519,7 @@ scsi_calc_syncparam(u_int period) /* Adjust for exception table being in 100ths. */ period *= 10; - num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]); + num_syncrates = nitems(scsi_syncrates); /* See if the period is in the "exception" table */ for (i = 0; i < num_syncrates; i++) { @@ -6568,8 +6565,7 @@ scsi_parse_transportid(char *transportid_str, goto bailout; } - num_proto_entries = sizeof(scsi_proto_map) / - sizeof(scsi_proto_map[0]); + num_proto_entries = nitems(scsi_proto_map); status = scsi_get_nv(scsi_proto_map, num_proto_entries, tmpstr, &table_entry, SCSI_NV_FLAG_IG_CASE); if (status != SCSI_NV_FOUND) { @@ -7289,7 +7285,7 @@ struct scsi_attrib_table_entry * scsi_get_attrib_entry(uint32_t id) { return (scsi_find_attrib_entry(scsi_mam_attr_table, - sizeof(scsi_mam_attr_table) / sizeof(scsi_mam_attr_table[0]), + nitems(scsi_mam_attr_table), id)); } @@ -7416,19 +7412,16 @@ scsi_attrib_sbuf(struct sbuf *sb, struct scsi_mam_attribute_header *hdr, table1 = user_table; table1_size = num_user_entries; table2 = scsi_mam_attr_table; - table2_size = sizeof(scsi_mam_attr_table) / - sizeof(scsi_mam_attr_table[0]); + table2_size = nitems(scsi_mam_attr_table); } else { table1 = scsi_mam_attr_table; - table1_size = sizeof(scsi_mam_attr_table) / - sizeof(scsi_mam_attr_table[0]); + table1_size = nitems(scsi_mam_attr_table); table2 = user_table; table2_size = num_user_entries; } } else { table1 = scsi_mam_attr_table; - table1_size = sizeof(scsi_mam_attr_table) / - sizeof(scsi_mam_attr_table[0]); + table1_size = nitems(scsi_mam_attr_table); } entry = scsi_find_attrib_entry(table1, table1_size, id); diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 7490b55..f505d2d 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -578,7 +578,7 @@ cdregister(struct cam_periph *periph, void *arg) */ match = cam_quirkmatch((caddr_t)&cgd->inq_data, (caddr_t)cd_quirk_table, - sizeof(cd_quirk_table)/sizeof(*cd_quirk_table), + nitems(cd_quirk_table), sizeof(*cd_quirk_table), scsi_inquiry_match); if (match != NULL) @@ -1266,8 +1266,7 @@ cdgetpagesize(int page_num) { int i; - for (i = 0; i < (sizeof(cd_page_size_table)/ - sizeof(cd_page_size_table[0])); i++) { + for (i = 0; i < nitems(cd_page_size_table); i++) { if (cd_page_size_table[i].page == page_num) return (cd_page_size_table[i].page_size); } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index d97e99d..5652c67 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2190,7 +2190,7 @@ daregister(struct cam_periph *periph, void *arg) */ match = cam_quirkmatch((caddr_t)&cgd->inq_data, (caddr_t)da_quirk_table, - sizeof(da_quirk_table)/sizeof(*da_quirk_table), + nitems(da_quirk_table), sizeof(*da_quirk_table), scsi_inquiry_match); if (match != NULL) diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 78d43d8..fa3745b 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -309,7 +309,7 @@ struct sa_prot_map { /*min_val*/ 0, /*max_val*/ 1, NULL } }; -#define SA_NUM_PROT_ENTS sizeof(sa_prot_table)/sizeof(sa_prot_table[0]) +#define SA_NUM_PROT_ENTS nitems(sa_prot_table) #define SA_PROT_ENABLED(softc) ((softc->flags & SA_FLAG_PROTECT_SUPP) \ && (softc->prot_info.cur_prot_state.initialized != 0) \ @@ -1313,7 +1313,7 @@ safindparament(struct mtparamset *ps) { unsigned int i; - for (i = 0; i < sizeof(sa_param_table) /sizeof(sa_param_table[0]); i++){ + for (i = 0; i < nitems(sa_param_table); i++){ /* * For entries, we compare all of the characters. For * nodes, we only compare the first N characters. The node @@ -2375,7 +2375,7 @@ saregister(struct cam_periph *periph, void *arg) */ match = cam_quirkmatch((caddr_t)&cgd->inq_data, (caddr_t)sa_quirk_table, - sizeof(sa_quirk_table)/sizeof(*sa_quirk_table), + nitems(sa_quirk_table), sizeof(*sa_quirk_table), scsi_inquiry_match); if (match != NULL) { diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index c0cc310..0dcd872 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -556,8 +556,7 @@ static struct scsi_quirk_entry scsi_quirk_table[] = }, }; -static const int scsi_quirk_table_size = - sizeof(scsi_quirk_table) / sizeof(*scsi_quirk_table); +static const int scsi_quirk_table_size = nitems(scsi_quirk_table); static cam_status proberegister(struct cam_periph *periph, void *arg); @@ -1848,8 +1847,7 @@ scsi_find_quirk(struct cam_ed *device) match = cam_quirkmatch((caddr_t)&device->inq_data, (caddr_t)scsi_quirk_table, - sizeof(scsi_quirk_table) / - sizeof(*scsi_quirk_table), + nitems(scsi_quirk_table), sizeof(*scsi_quirk_table), scsi_inquiry_match); if (match == NULL) diff --git a/sys/cam/scsi/smp_all.c b/sys/cam/scsi/smp_all.c index 064f1d5..a81c59c 100644 --- a/sys/cam/scsi/smp_all.c +++ b/sys/cam/scsi/smp_all.c @@ -118,8 +118,7 @@ smp_error_desc(int function_result) { int i; - for (i = 0; i < (sizeof(smp_error_table)/sizeof(smp_error_table[0])); - i++){ + for (i = 0; i < nitems(smp_error_table); i++){ if (function_result == smp_error_table[i].function_result) return (smp_error_table[i].desc); } @@ -164,7 +163,7 @@ smp_command_desc(uint8_t cmd_num) { int i; - for (i = 0; i < (sizeof(smp_cmd_table)/sizeof(smp_cmd_table[0])) && + for (i = 0; i < nitems(smp_cmd_table) && smp_cmd_table[i].cmd_num <= cmd_num; i++) { if (cmd_num == smp_cmd_table[i].cmd_num) return (smp_cmd_table[i].desc); diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c index 3b3a45b..49644b2 100644 --- a/sys/dev/advansys/adv_isa.c +++ b/sys/dev/advansys/adv_isa.c @@ -96,7 +96,7 @@ static u_int16_t adv_isa_ioports[] = 0x330 /* Eighth and default selection in BIOS setup */ }; -#define MAX_ISA_IOPORT_INDEX (sizeof(adv_isa_ioports)/sizeof(u_int16_t) - 1) +#define MAX_ISA_IOPORT_INDEX (nitems(adv_isa_ioports) - 1) static int adv_isa_probe(device_t dev); static int adv_isa_attach(device_t dev); diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index eb45d1c..9080876 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -316,7 +316,7 @@ advasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg) target_mask = ADV_TID_TO_TARGET_MASK(cgd->ccb_h.target_id); - num_entries = sizeof(adv_quirk_table)/sizeof(*adv_quirk_table); + num_entries = nitems(adv_quirk_table); match = cam_quirkmatch((caddr_t)&cgd->inq_data, (caddr_t)adv_quirk_table, num_entries, sizeof(*adv_quirk_table), diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c index b887056..0c02c17 100644 --- a/sys/dev/ae/if_ae.c +++ b/sys/dev/ae/if_ae.c @@ -85,7 +85,7 @@ static struct ae_dev { { VENDORID_ATTANSIC, DEVICEID_ATTANSIC_L2, "Attansic Technology Corp, L2 FastEthernet" }, }; -#define AE_DEVS_COUNT (sizeof(ae_devs) / sizeof(*ae_devs)) +#define AE_DEVS_COUNT (nitems(ae_devs)) static struct resource_spec ae_res_spec_mem[] = { { SYS_RES_MEMORY, PCIR_BAR(0), RF_ACTIVE }, diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c index 7d4e1ef..90414a7 100644 --- a/sys/dev/aic/aic.c +++ b/sys/dev/aic/aic.c @@ -1443,7 +1443,7 @@ aic_init(struct aic_softc *aic) aic->chip_type = AIC6260; aic_insb(aic, ID, chip_id, sizeof(chip_id) - 1); chip_id[sizeof(chip_id) - 1] = '\0'; - for (i = 0; i < sizeof(aic_chip_ids) / sizeof(aic_chip_ids[0]); i++) { + for (i = 0; i < nitems(aic_chip_ids); i++) { if (!strcmp(chip_id, aic_chip_ids[i].idstring)) { aic->chip_type = aic_chip_ids[i].type; break; diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c index d2d2bc3..84e7f7b 100644 --- a/sys/dev/aic/aic_cbus.c +++ b/sys/dev/aic/aic_cbus.c @@ -57,7 +57,8 @@ static int aic_isa_probe(device_t); static int aic_isa_attach(device_t); static u_int aic_isa_ports[] = { 0x1840 }; -#define AIC_ISA_NUMPORTS (sizeof(aic_isa_ports) / sizeof(aic_isa_ports[0])) + +#define AIC_ISA_NUMPORTS nitems(aic_isa_ports) #define AIC_ISA_PORTSIZE 0x20 #define AIC98_GENERIC 0x00 diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c index 7e8c239..a134312 100644 --- a/sys/dev/aic/aic_isa.c +++ b/sys/dev/aic/aic_isa.c @@ -57,7 +57,7 @@ static int aic_isa_probe(device_t); static int aic_isa_attach(device_t); static u_int aic_isa_ports[] = { 0x340, 0x140 }; -#define AIC_ISA_NUMPORTS (sizeof(aic_isa_ports) / sizeof(aic_isa_ports[0])) +#define AIC_ISA_NUMPORTS (nitems(aic_isa_ports)) #define AIC_ISA_PORTSIZE 0x20 static struct isa_pnp_id aic_ids[] = { diff --git a/sys/dev/fb/creator.c b/sys/dev/fb/creator.c index 488d00d..89cf877 100644 --- a/sys/dev/fb/creator.c +++ b/sys/dev/fb/creator.c @@ -151,8 +151,7 @@ static const struct { { FFB_VIRT_EXP, FFB_PHYS_EXP, FFB_SIZE_EXP }, }; -#define CREATOR_FB_MAP_SIZE \ - (sizeof(creator_fb_map) / sizeof(creator_fb_map[0])) +#define CREATOR_FB_MAP_SIZE nitems(creator_fb_map) extern const struct gfb_font gallant12x22; diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index 183e20c..aa2d300 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -610,7 +610,7 @@ fb_type(int adp_type) }; int i; - for (i = 0; i < sizeof(types)/sizeof(types[0]); ++i) { + for (i = 0; i < nitems(types); ++i) { if (types[i].va_type == adp_type) return types[i].fb_type; } diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c index de1e98e..03e209d 100644 --- a/sys/dev/fb/machfb.c +++ b/sys/dev/fb/machfb.c @@ -478,7 +478,7 @@ machfb_configure(int flags) return (0); if (OF_getprop(output, "device-id", &id, sizeof(id)) == -1) return (0); - for (i = 0; i < sizeof(machfb_info) / sizeof(machfb_info[0]); i++) { + for (i = 0; i < nitems(machfb_info); i++) { if (id == machfb_info[i].chip_id) { sc->sc_flags = MACHFB_CONSOLE; sc->sc_node = output; @@ -532,7 +532,7 @@ machfb_init(int unit, video_adapter_t *adp, int flags) return (ENXIO); sc->sc_ramdac_freq = 0; - for (i = 0; i < sizeof(machfb_info) / sizeof(machfb_info[0]); i++) { + for (i = 0; i < nitems(machfb_info); i++) { if (sc->sc_chip_id == machfb_info[i].chip_id) { sc->sc_ramdac_freq = machfb_info[i].ramdac_freq; break; @@ -1139,7 +1139,7 @@ machfb_pci_probe(device_t dev) pci_get_subclass(dev) != PCIS_DISPLAY_VGA) return (ENXIO); - for (i = 0; i < sizeof(machfb_info) / sizeof(machfb_info[0]); i++) { + for (i = 0; i < nitems(machfb_info); i++) { if (pci_get_device(dev) == machfb_info[i].chip_id) { device_set_desc(dev, machfb_info[i].name); return (BUS_PROBE_DEFAULT); diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index c7c2d64..cdd836c 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -653,7 +653,7 @@ vesa_map_gen_mode_num(int type, int color, int mode) }; int i; - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return (mode_map[i].to); } @@ -676,7 +676,7 @@ vesa_translate_flags(u_int16_t vflags) int flags; int i; - for (flags = 0, i = 0; i < sizeof(ftable)/sizeof(ftable[0]); ++i) { + for (flags = 0, i = 0; i < nitems(ftable); ++i) { flags |= (vflags & ftable[i].mask) ? ftable[i].set : ftable[i].reset; } diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 78abb18..365fca4 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -602,7 +602,7 @@ map_mode_num(int mode) }; int i; - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return mode_map[i].to; } @@ -655,7 +655,7 @@ map_gen_mode_num(int type, int color, int mode) } } - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return ((color) ? mode_map[i].to_color : mode_map[i].to_mono); } @@ -702,7 +702,7 @@ map_bios_mode_num(int type, int color, int bios_mode) switch (type) { case KD_VGA: - if (bios_mode < sizeof(vga_modes)/sizeof(vga_modes[0])) + if (bios_mode < nitems(vga_modes)) return vga_modes[bios_mode]; else if (color) return M_VGA_C80x25; @@ -711,7 +711,7 @@ map_bios_mode_num(int type, int color, int bios_mode) break; case KD_EGA: - if (bios_mode < sizeof(ega_modes)/sizeof(ega_modes[0])) + if (bios_mode < nitems(ega_modes)) return ega_modes[bios_mode]; else if (color) return M_ENH_C80x25; @@ -720,7 +720,7 @@ map_bios_mode_num(int type, int color, int bios_mode) break; case KD_CGA: - if (bios_mode < sizeof(cga_modes)/sizeof(cga_modes[0])) + if (bios_mode < nitems(cga_modes)) return cga_modes[bios_mode]; else return M_C80x25; @@ -772,7 +772,7 @@ fill_adapter_param(int code, video_adapter_t *adp) { DCC_EGAMONO, DCC_CGA80 }, }; - if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) { + if ((code < 0) || (code >= nitems(dcc))) { adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO]; adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80]; } else { @@ -918,7 +918,7 @@ comp_adpregs(u_char *buf1, u_char *buf2) if ((buf1 == NULL) || (buf2 == NULL)) return COMP_DIFFERENT; - for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) { + for (i = 0; i < nitems(params); ++i) { if (params[i].mask == 0) /* don't care */ continue; if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask)) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 0bee138..14d708a 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -241,8 +241,7 @@ const struct amd_event_code_map amd_event_codes[] = { }; -const int amd_event_codes_size = - sizeof(amd_event_codes) / sizeof(amd_event_codes[0]); +const int amd_event_codes_size = nitems(amd_event_codes); /* * Per-processor information diff --git a/sys/dev/hwpmc/hwpmc_mips24k.c b/sys/dev/hwpmc/hwpmc_mips24k.c index 7841555..ac42559 100644 --- a/sys/dev/hwpmc/hwpmc_mips24k.c +++ b/sys/dev/hwpmc/hwpmc_mips24k.c @@ -149,8 +149,7 @@ const struct mips_event_code_map mips_event_codes[] = { }; -const int mips_event_codes_size = - sizeof(mips_event_codes) / sizeof(mips_event_codes[0]); +const int mips_event_codes_size = nitems(mips_event_codes); struct mips_pmc_spec mips_pmc_spec = { .ps_cpuclass = PMC_CLASS_MIPS24K, diff --git a/sys/dev/hwpmc/hwpmc_mips74k.c b/sys/dev/hwpmc/hwpmc_mips74k.c index 59f677d..773a482 100644 --- a/sys/dev/hwpmc/hwpmc_mips74k.c +++ b/sys/dev/hwpmc/hwpmc_mips74k.c @@ -181,8 +181,7 @@ const struct mips_event_code_map mips_event_codes[] = { { PMC_EV_MIPS74K_WBB_25_50_FULL, MIPS_CTR_1, 76 }, }; -const int mips_event_codes_size = - sizeof(mips_event_codes) / sizeof(mips_event_codes[0]); +const int mips_event_codes_size = nitems(mips_event_codes); struct mips_pmc_spec mips_pmc_spec = { .ps_cpuclass = PMC_CLASS_MIPS74K, diff --git a/sys/dev/hwpmc/hwpmc_octeon.c b/sys/dev/hwpmc/hwpmc_octeon.c index b614573..7518282 100644 --- a/sys/dev/hwpmc/hwpmc_octeon.c +++ b/sys/dev/hwpmc/hwpmc_octeon.c @@ -103,8 +103,7 @@ const struct mips_event_code_map mips_event_codes[] = { PMC_EV_OCTEON_SYNCW, MIPS_CTR_ALL, CVMX_CORE_PERF_SYNCW }, }; -const int mips_event_codes_size = - sizeof(mips_event_codes) / sizeof(mips_event_codes[0]); +const int mips_event_codes_size = nitems(mips_event_codes); struct mips_pmc_spec mips_pmc_spec = { .ps_cpuclass = PMC_CLASS_OCTEON, diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c index f2a77dd..70a91aa 100644 --- a/sys/dev/le/if_le_isa.c +++ b/sys/dev/le/if_le_isa.c @@ -241,8 +241,7 @@ le_isa_probe(device_t dev) case 0: return (BUS_PROBE_DEFAULT); case ENOENT: - for (i = 0; i < sizeof(le_isa_params) / - sizeof(le_isa_params[0]); i++) { + for (i = 0; i < nitems(le_isa_params); i++) { if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) { device_set_desc(dev, le_isa_params[i].name); return (BUS_PROBE_DEFAULT); @@ -279,8 +278,7 @@ le_isa_attach(device_t dev) macstride = 1; break; case ENOENT: - for (i = 0; i < sizeof(le_isa_params) / - sizeof(le_isa_params[0]); i++) { + for (i = 0; i < nitems(le_isa_params); i++) { if (le_isa_probe_legacy(dev, &le_isa_params[i]) == 0) { lesc->sc_rres = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &j, diff --git a/sys/dev/le/if_le_lebuffer.c b/sys/dev/le/if_le_lebuffer.c index c1fdda7..f2147ea 100644 --- a/sys/dev/le/if_le_lebuffer.c +++ b/sys/dev/le/if_le_lebuffer.c @@ -104,8 +104,7 @@ MODULE_DEPEND(le, lebuffer, 1, 1, 1); static const int le_lebuffer_media[] = { IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, 0) }; -#define NLEMEDIA \ - (sizeof(le_lebuffer_media) / sizeof(le_lebuffer_media[0])) +#define NLEMEDIA nitems(le_lebuffer_media) static void le_lebuffer_wrcsr(struct lance_softc *, uint16_t, uint16_t); static uint16_t le_lebuffer_rdcsr(struct lance_softc *, uint16_t); diff --git a/sys/dev/le/if_le_ledma.c b/sys/dev/le/if_le_ledma.c index 44cb41f..e86f947 100644 --- a/sys/dev/le/if_le_ledma.c +++ b/sys/dev/le/if_le_ledma.c @@ -388,7 +388,7 @@ le_dma_attach(device_t dev) sc->sc_mediachange = le_dma_supmediachange; sc->sc_mediastatus = le_dma_supmediastatus; sc->sc_supmedia = le_dma_supmedia; - sc->sc_nsupmedia = sizeof(le_dma_supmedia) / sizeof(le_dma_supmedia[0]); + sc->sc_nsupmedia = nitems(le_dma_supmedia); sc->sc_defaultmedia = le_dma_supmedia[0]; OF_getetheraddr(dev, sc->sc_enaddr); diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c index a00cb6a..88f414a 100644 --- a/sys/dev/rndtest/rndtest.c +++ b/sys/dev/rndtest/rndtest.c @@ -68,7 +68,7 @@ static const struct rndtest_testfunc { { rndtest_longruns }, }; -#define RNDTEST_NTESTS (sizeof(rndtest_funcs)/sizeof(rndtest_funcs[0])) +#define RNDTEST_NTESTS nitems(rndtest_funcs) static SYSCTL_NODE(_kern, OID_AUTO, rndtest, CTLFLAG_RD, 0, "RNG test parameters"); diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c index 43c0096..cf5cd5b 100644 --- a/sys/dev/uart/uart_kbd_sun.c +++ b/sys/dev/uart/uart_kbd_sun.c @@ -857,7 +857,7 @@ keycode2scancode(int keycode, int shift, int up) int scancode; scancode = keycode; - if ((keycode >= 89) && (keycode < 89 + sizeof(scan) / sizeof(scan[0]))) + if ((keycode >= 89) && (keycode < 89 + nitems(scan))) scancode = scan[keycode - 89] | SCAN_PREFIX_E0; /* pause/break */ if ((keycode == 104) && !(shift & CTLS)) diff --git a/sys/mips/nlm/board.c b/sys/mips/nlm/board.c index 1cb50a2..bb335bf 100644 --- a/sys/mips/nlm/board.c +++ b/sys/mips/nlm/board.c @@ -105,10 +105,10 @@ nlm_get_vfbid_mapping(int vfbid) struct vfbid_tbl *p; if (nlm_is_xlp3xx()) { - nentries = sizeof(nlm3xx_vfbid)/sizeof(struct vfbid_tbl); + nentries = nitems(nlm3xx_vfbid); p = nlm3xx_vfbid; } else { - nentries = sizeof(nlm_vfbid)/sizeof(struct vfbid_tbl); + nentries = nitems(nlm_vfbid); p = nlm_vfbid; } diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c index 9fa95c7..ff4810c 100644 --- a/sys/mips/rmi/dev/nlge/if_nlge.c +++ b/sys/mips/rmi/dev/nlge/if_nlge.c @@ -2404,7 +2404,7 @@ dump_fmn_cpu_credits_for_gmac(struct xlr_board_info *board, int gmac_id) int j, k, r, c; int n_gmac_buckets; - n_gmac_buckets = sizeof (gmac_bucket_ids) / sizeof (gmac_bucket_ids[0]); + n_gmac_buckets = nitems(gmac_bucket_ids); for (j = 0; j < 8; j++) { // for each cpu cc = board->credit_configs[j]; printf("Credits for Station CPU_%d ---> GMAC buckets (tx path)\n", j); @@ -2518,7 +2518,7 @@ dump_mii_regs(struct nlge_softc *sc) if (sc->mii_base == NULL || sc->mii_bus == NULL) return; - n_regs = sizeof (mii_regs) / sizeof (mii_regs[0]); + n_regs = nitems(mii_regs); for (i = 0; i < n_regs; i++) { printf("[mii_0x%x] = %x\n", mii_regs[i], nlge_mii_read_internal(sc->mii_base, sc->phy_addr, diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index ef168ac..c0a7032 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -872,7 +872,7 @@ text_status(node_p node, char *arg, u_int len) sbuf_new(&sbuf, arg, len, SBUF_FIXEDLEN); sbuf_printf(&sbuf, "interface: %s\n", priv->ifp->if_xname); - if (mib->device >= sizeof(devices) / sizeof(devices[0])) + if (mib->device >= nitems(devices)) sbuf_printf(&sbuf, "device=unknown\nvendor=unknown\n"); else sbuf_printf(&sbuf, "device=%s\nvendor=%s\n", diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c index ce0fba0..0a0644e 100644 --- a/sys/netgraph/ng_gif_demux.c +++ b/sys/netgraph/ng_gif_demux.c @@ -111,7 +111,7 @@ const static struct iffam gFamilies[] = { { AF_ATM, NG_GIF_DEMUX_HOOK_ATM }, { AF_NATM, NG_GIF_DEMUX_HOOK_NATM }, }; -#define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) +#define NUM_FAMILIES nitems(gFamilies) /* Per-node private data */ struct ng_gif_demux_private { diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index 7bbc1da..6bd55c7 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -104,7 +104,7 @@ const static struct iffam gFamilies[] = { { AF_ATM, NG_IFACE_HOOK_ATM }, { AF_NATM, NG_IFACE_HOOK_NATM }, }; -#define NUM_FAMILIES (sizeof(gFamilies) / sizeof(*gFamilies)) +#define NUM_FAMILIES nitems(gFamilies) /* Node private data */ struct ng_iface_private { diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 76d6383..08ee763 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -1163,7 +1163,7 @@ struct domain ngdomain = { .dom_family = AF_NETGRAPH, .dom_name = "netgraph", .dom_protosw = ngsw, - .dom_protoswNPROTOSW = &ngsw[sizeof(ngsw) / sizeof(ngsw[0])] + .dom_protoswNPROTOSW = &ngsw[nitems(ngsw)] }; /* diff --git a/sys/security/audit/bsm_fcntl.c b/sys/security/audit/bsm_fcntl.c index 5d27a3a..e29f11a 100644 --- a/sys/security/audit/bsm_fcntl.c +++ b/sys/security/audit/bsm_fcntl.c @@ -237,8 +237,7 @@ static const bsm_fcntl_cmd_t bsm_fcntl_cmdtab[] = { { BSM_F_FS_SPECIFIC_15, FCNTL_FS_SPECIFIC_BASE + 15}, #endif /* FCNTL_FS_SPECIFIC_BASE */ }; -static const int bsm_fcntl_cmd_count = sizeof(bsm_fcntl_cmdtab) / - sizeof(bsm_fcntl_cmdtab[0]); +static const int bsm_fcntl_cmd_count = nitems(bsm_fcntl_cmdtab); static const bsm_fcntl_cmd_t * bsm_lookup_local_fcntl_cmd(int local_fcntl_cmd) diff --git a/sys/security/audit/bsm_socket_type.c b/sys/security/audit/bsm_socket_type.c index 94c361c..afa8e6c 100644 --- a/sys/security/audit/bsm_socket_type.c +++ b/sys/security/audit/bsm_socket_type.c @@ -52,8 +52,7 @@ static const struct bsm_socket_type bsm_socket_types[] = { { BSM_SOCK_RDM, SOCK_RDM }, { BSM_SOCK_SEQPACKET, SOCK_SEQPACKET }, }; -static const int bsm_socket_types_count = sizeof(bsm_socket_types) / - sizeof(bsm_socket_types[0]); +static const int bsm_socket_types_count = nitems(bsm_socket_types); static const struct bsm_socket_type * bsm_lookup_local_socket_type(int local_socket_type) |