diff options
author | pfg <pfg@FreeBSD.org> | 2016-04-21 15:38:28 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-04-21 15:38:28 +0000 |
commit | fc65edc1cd05de15ef17e14dc54c2bf6c41ccab8 (patch) | |
tree | 45622d9ce5a6c394316a37f672cfd0a033c48374 /sys/dev/advansys | |
parent | fdf39652a42767663d4a74a1a367d193185c51e9 (diff) | |
download | FreeBSD-src-fc65edc1cd05de15ef17e14dc54c2bf6c41ccab8.zip FreeBSD-src-fc65edc1cd05de15ef17e14dc54c2bf6c41ccab8.tar.gz |
Remove slightly used const values that can be replaced with nitems().
Suggested by: jhb
Diffstat (limited to 'sys/dev/advansys')
-rw-r--r-- | sys/dev/advansys/adw_pci.c | 5 | ||||
-rw-r--r-- | sys/dev/advansys/adwlib.c | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index 108647e..f8fa3d0 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -121,9 +121,6 @@ struct adw_pci_identity adw_pci_ident_table[] = #endif }; -static const int adw_num_pci_devs = - sizeof(adw_pci_ident_table) / sizeof(*adw_pci_ident_table); - #define ADW_PCI_MAX_DMA_ADDR (0xFFFFFFFFUL) #define ADW_PCI_MAX_DMA_COUNT (0xFFFFFFFFUL) @@ -173,7 +170,7 @@ adw_find_pci_device(device_t dev) pci_get_subdevice(dev), pci_get_subvendor(dev)); - for (i = 0; i < adw_num_pci_devs; i++) { + for (i = 0; i < nitems(adw_pci_ident_table); i++) { entry = &adw_pci_ident_table[i]; if (entry->full_id == (full_id & entry->id_mask)) return (entry); diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c index b820773..e201cdf 100644 --- a/sys/dev/advansys/adwlib.c +++ b/sys/dev/advansys/adwlib.c @@ -161,8 +161,6 @@ const struct adw_syncrate adw_syncrates[] = { ADW_MC_SDTR_ASYNC, 0, "async" } }; -const int adw_num_syncrates = sizeof(adw_syncrates) / sizeof(adw_syncrates[0]); - static u_int16_t adw_eeprom_read_16(struct adw_softc *adw, int addr); static void adw_eeprom_write_16(struct adw_softc *adw, int addr, u_int data); @@ -817,7 +815,7 @@ adw_find_sdtr(struct adw_softc *adw, u_int period) if (period == 0) return ADW_MC_SDTR_ASYNC; - for (; i < adw_num_syncrates; i++) { + for (; i < nitems(adw_syncrates); i++) { if (period <= adw_syncrates[i].period) return (adw_syncrates[i].mc_sdtr); } @@ -829,7 +827,7 @@ adw_find_period(struct adw_softc *adw, u_int mc_sdtr) { int i; - for (i = 0; i < adw_num_syncrates; i++) { + for (i = 0; i < nitems(adw_syncrates); i++) { if (mc_sdtr == adw_syncrates[i].mc_sdtr) break; } |