Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netdev: convert non-obvious instances to use ARRAY_SIZE()

This will convert remaining non-obvious or naive calculations of array
sizes to use ARRAY_SIZE() macro.

Signed-off-by: Alejandro Martinez Ruiz <alex@flawedcode.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

Alejandro Martinez Ruiz and committed by
Jeff Garzik
e9edda69 88a15f2e

+11 -11
+1 -1
drivers/net/cassini.c
··· 4443 4443 {REG_MAC_COLL_EXCESS}, 4444 4444 {REG_MAC_COLL_LATE} 4445 4445 }; 4446 - #define CAS_REG_LEN (sizeof(ethtool_register_table)/sizeof(int)) 4446 + #define CAS_REG_LEN ARRAY_SIZE(ethtool_register_table) 4447 4447 #define CAS_MAX_REGS (sizeof (u32)*CAS_REG_LEN) 4448 4448 4449 4449 static void cas_read_regs(struct cas *cp, u8 *ptr, int len)
+1 -1
drivers/net/irda/donauboe.c
··· 840 840 841 841 /* test 1: SIR filter and back to back */ 842 842 843 - for (j = 0; j < (sizeof (bauds) / sizeof (int)); ++j) 843 + for (j = 0; j < ARRAY_SIZE(bauds); ++j) 844 844 { 845 845 int fir = (j > 1); 846 846 toshoboe_stopchip (self);
+2 -2
drivers/net/ne-h8300.c
··· 93 93 bus_width = *(volatile unsigned char *)ABWCR; 94 94 bus_width &= 1 << ((base_addr >> 21) & 7); 95 95 96 - for (i = 0; i < sizeof(reg_offset) / sizeof(u32); i++) 96 + for (i = 0; i < ARRAY_SIZE(reg_offset); i++) 97 97 if (bus_width == 0) 98 98 reg_offset[i] = i * 2 + 1; 99 99 else ··· 115 115 116 116 static inline int init_dev(struct net_device *dev) 117 117 { 118 - if (h8300_ne_count < (sizeof(h8300_ne_base) / sizeof(unsigned long))) { 118 + if (h8300_ne_count < ARRAY_SIZE(h8300_ne_base)) { 119 119 dev->base_addr = h8300_ne_base[h8300_ne_count]; 120 120 dev->irq = h8300_ne_irq[h8300_ne_count]; 121 121 h8300_ne_count++;
+1 -1
drivers/net/tg3.c
··· 9034 9034 int i; 9035 9035 u32 j; 9036 9036 9037 - for (i = 0; i < sizeof(test_pattern)/sizeof(u32); i++) { 9037 + for (i = 0; i < ARRAY_SIZE(test_pattern); i++) { 9038 9038 for (j = 0; j < len; j += 4) { 9039 9039 u32 val; 9040 9040
+2 -2
drivers/net/tulip/de4x5.c
··· 1041 1041 {DC21142, dc21142_infoleaf}, 1042 1042 {DC21143, dc21143_infoleaf} 1043 1043 }; 1044 - #define INFOLEAF_SIZE (sizeof(infoleaf_array)/(sizeof(int)+sizeof(int *))) 1044 + #define INFOLEAF_SIZE ARRAY_SIZE(infoleaf_array) 1045 1045 1046 1046 /* 1047 1047 ** List the SROM info block functions ··· 1056 1056 compact_infoblock 1057 1057 }; 1058 1058 1059 - #define COMPACT (sizeof(dc_infoblock)/sizeof(int *) - 1) 1059 + #define COMPACT (ARRAY_SIZE(dc_infoblock) - 1) 1060 1060 1061 1061 /* 1062 1062 ** Miscellaneous defines...
+4 -4
drivers/net/wan/sdla.c
··· 1342 1342 if (flp->initialized) 1343 1343 return(-EINVAL); 1344 1344 1345 - for(i=0;i < sizeof(valid_port) / sizeof (int) ; i++) 1345 + for(i=0; i < ARRAY_SIZE(valid_port); i++) 1346 1346 if (valid_port[i] == map->base_addr) 1347 1347 break; 1348 1348 1349 - if (i == sizeof(valid_port) / sizeof(int)) 1349 + if (i == ARRAY_SIZE(valid_port)) 1350 1350 return(-EINVAL); 1351 1351 1352 1352 if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){ ··· 1487 1487 } 1488 1488 } 1489 1489 1490 - for(i=0;i < sizeof(valid_mem) / sizeof (int) ; i++) 1490 + for(i=0; i < ARRAY_SIZE(valid_mem); i++) 1491 1491 if (valid_mem[i] == map->mem_start) 1492 1492 break; 1493 1493 1494 1494 err = -EINVAL; 1495 - if (i == sizeof(valid_mem) / sizeof(int)) 1495 + if (i == ARRAY_SIZE(valid_mem)) 1496 1496 goto fail2; 1497 1497 1498 1498 if (flp->type == SDLA_S502A && (map->mem_start & 0xF000) >> 12 == 0x0E)