From 42747553f484b2cfcfb919643e1749c9ad782766 Mon Sep 17 00:00:00 2001 From: pfg Date: Thu, 21 Apr 2016 19:40:10 +0000 Subject: sys: use our nitems() macro when param.h is available. This should cover all the remaining cases in the kernel. Discussed in: freebsd-current --- sys/cam/ata/ata_da.c | 2 +- sys/cam/scsi/scsi_all.c | 43 ++++++++++++++++++------------------------- sys/cam/scsi/scsi_cd.c | 5 ++--- sys/cam/scsi/scsi_da.c | 2 +- sys/cam/scsi/scsi_sa.c | 6 +++--- sys/cam/scsi/scsi_xpt.c | 6 ++---- sys/cam/scsi/smp_all.c | 5 ++--- 7 files changed, 29 insertions(+), 40 deletions(-) (limited to 'sys/cam') 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); -- cgit v1.1