drivers/net/: all drivers/net/ cleanup with ARRAY_SIZE

Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/net/: all drivers/net/ cleanup with ARRAY_SIZE
Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Denis Cheng · David S. Miller
1 parent 10d024c1b2
Showing 37 changed files with 70 additions and 78 deletions Side-by-side Diff
drivers/net/apne.c
drivers/net/arm/am79c961a.c
drivers/net/atarilance.c
drivers/net/atl1/atl1_hw.c
drivers/net/bnx2.c
drivers/net/cs89x0.c
drivers/net/e1000/e1000_ethtool.c
drivers/net/fec_8xx/fec_mii.c
drivers/net/ibm_emac/ibm_emac_debug.c
drivers/net/irda/actisys-sir.c
drivers/net/ixgb/ixgb_ethtool.c
drivers/net/lp486e.c
drivers/net/mv643xx_eth.c
drivers/net/ne-h8300.c
drivers/net/ne.c
drivers/net/ne2.c
drivers/net/ne2k-pci.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_hw.c
drivers/net/pcmcia/axnet_cs.c
@@ -246,7 +246,7 @@
 	    {0x00,	NE_EN0_RSARHI},
 	    {E8390_RREAD+E8390_START, NE_CMD},
 	};
-	for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(program_seq); i++) {
 	    outb(program_seq[i].value, ioaddr + program_seq[i].offset);
 	}
  
@@ -414,7 +414,7 @@
 	/*
 	 * Update the multicast hash table
 	 */
-	for (i = 0; i < sizeof(multi_hash) / sizeof(multi_hash[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(multi_hash); i++)
 		write_rreg(dev->base_addr, i + LADRL, multi_hash[i]);
  
 	/*
@@ -263,7 +263,7 @@
 									   (highest byte stripped) */
 };
  
-#define	N_LANCE_ADDR	(sizeof(lance_addr_list)/sizeof(*lance_addr_list))
+#define	N_LANCE_ADDR	ARRAY_SIZE(lance_addr_list)
  
  
 /* Definitions for the Lance */
@@ -603,7 +603,7 @@
  
 static void atl1_init_flash_opcode(struct atl1_hw *hw)
 {
-	if (hw->flash_vendor >= sizeof(flash_table) / sizeof(flash_table[0]))
+	if (hw->flash_vendor >= ARRAY_SIZE(flash_table))
 		hw->flash_vendor = 0;	/* ATMEL */
  
 	/* Init OP table */
@@ -3492,7 +3492,7 @@
 	/* Determine the selected interface. */
 	val = REG_RD(bp, BNX2_NVM_CFG1);
  
-	entry_count = sizeof(flash_table) / sizeof(struct flash_spec);
+	entry_count = ARRAY_SIZE(flash_table);
  
 	if (val & 0x40000000) {
  
@@ -805,7 +805,7 @@
 		        i = cs8900_irq_map[0];
 #else
 			/* Translate the IRQ using the IRQ mapping table. */
-			if (i >= sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]))
+			if (i >= ARRAY_SIZE(cs8900_irq_map))
 				printk("\ncs89x0: invalid ISA interrupt number %d\n", i);
 			else
 				i = cs8900_irq_map[i];
  
@@ -1246,11 +1246,11 @@
  
 	if (chip_type == CS8900) {
 		/* Search the mapping table for the corresponding IRQ pin. */
-		for (i = 0; i != sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]); i++)
+		for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++)
 			if (cs8900_irq_map[i] == irq)
 				break;
 		/* Not found */
-		if (i == sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]))
+		if (i == ARRAY_SIZE(cs8900_irq_map))
 			i = 3;
 		writereg(dev, PP_CS8900_ISAINT, i);
 	} else {
@@ -106,8 +106,7 @@
 };
  
 #define E1000_QUEUE_STATS_LEN 0
-#define E1000_GLOBAL_STATS_LEN	\
-	sizeof(e1000_gstrings_stats) / sizeof(struct e1000_stats)
+#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
 #define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN + E1000_QUEUE_STATS_LEN)
 static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
 	"Register test  (offline)", "Eeprom test    (offline)",
@@ -308,12 +308,11 @@
 		return -1;
 	}
  
-	for (i = 0, phy = phy_info; i < sizeof(phy_info) / sizeof(phy_info[0]);
-	     i++, phy++)
+	for (i = 0, phy = phy_info; i < ARRAY_SIZE(phy_info); i++, phy++)
 		if (phy->id == (phy_hwid >> 4) || phy->id == 0)
 			break;
  
-	if (i >= sizeof(phy_info) / sizeof(phy_info[0])) {
+	if (i >= ARRAY_SIZE(phy_info)) {
 		printk(KERN_ERR DRV_MODULE_NAME
 		       ": %s PHY id 0x%08x is not supported!\n",
 		       dev->name, phy_hwid);
@@ -132,7 +132,7 @@
 {
 	unsigned long flags;
  
-	if (idx >= sizeof(__emacs) / sizeof(__emacs[0])) {
+	if (idx >= ARRAY_SIZE(__emacs)) {
 		printk(KERN_WARNING
 		       "invalid index %d when registering EMAC for debugging\n",
 		       idx);
@@ -148,7 +148,7 @@
 {
 	unsigned long flags;
  
-	if (idx >= sizeof(__mals) / sizeof(__mals[0])) {
+	if (idx >= ARRAY_SIZE(__mals)) {
 		printk(KERN_WARNING
 		       "invalid index %d when registering MAL for debugging\n",
 		       idx);
  
@@ -167,11 +167,11 @@
  
 	local_irq_save(flags);
  
-	for (i = 0; i < sizeof(__mals) / sizeof(__mals[0]); ++i)
+	for (i = 0; i < ARRAY_SIZE(__mals); ++i)
 		if (__mals[i])
 			emac_mal_dump(__mals[i]);
  
-	for (i = 0; i < sizeof(__emacs) / sizeof(__emacs[0]); ++i)
+	for (i = 0; i < ARRAY_SIZE(__emacs); ++i)
 		if (__emacs[i])
 			emac_mac_dump(i, __emacs[i]);
  
@@ -67,7 +67,7 @@
 /* Note : the 220L doesn't support 38400, but we will fix that below */
 static unsigned baud_rates[] = { 9600, 19200, 57600, 115200, 38400 };
  
-#define MAX_SPEEDS (sizeof(baud_rates)/sizeof(baud_rates[0]))
+#define MAX_SPEEDS ARRAY_SIZE(baud_rates)
  
 static struct dongle_driver act220l = {
 	.owner		= THIS_MODULE,
@@ -94,8 +94,7 @@
 	{"tx_csum_offload_errors", IXGB_STAT(hw_csum_tx_error)}
 };
  
-#define IXGB_STATS_LEN	\
-	sizeof(ixgb_gstrings_stats) / sizeof(struct ixgb_stats)
+#define IXGB_STATS_LEN	ARRAY_SIZE(ixgb_gstrings_stats)
  
 static int
 ixgb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
@@ -515,8 +515,6 @@
 	outb(0, IOADDR+8);
 }
  
-#define SIZE(x)	(sizeof(x)/sizeof((x)[0]))
-
 #if 0
 /* selftest or dump */
 static void
@@ -532,7 +530,7 @@
 	mdelay(30);             /* random, unmotivated */
  
 	printk("lp486e i82596 %s result:\n", cmdname);
-	for (m = SIZE(lp->dump.dump); m && lp->dump.dump[m-1] == 0; m--)
+	for (m = ARRAY_SIZE(lp->dump.dump); m && lp->dump.dump[m-1] == 0; m--)
 		;
 	for (i = 0; i < m; i++) {
 		printk(" %04x", lp->dump.dump[i]);
@@ -2680,8 +2680,7 @@
 	{ "late_collision", MV643XX_STAT(mib_counters.late_collision) },
 };
  
-#define MV643XX_STATS_LEN	\
-	sizeof(mv643xx_gstrings_stats) / sizeof(struct mv643xx_stats)
+#define MV643XX_STATS_LEN	ARRAY_SIZE(mv643xx_gstrings_stats)
  
 static void mv643xx_get_drvinfo(struct net_device *netdev,
 				struct ethtool_drvinfo *drvinfo)
@@ -257,7 +257,7 @@
 			{E8390_RREAD+E8390_START, E8390_CMD},
 		};
  
-		for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+		for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 			outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
  
 	}
@@ -375,7 +375,7 @@
 			{E8390_RREAD+E8390_START, E8390_CMD},
 		};
  
-		for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+		for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 			outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
  
 	}
@@ -430,7 +430,7 @@
 			{E8390_RREAD+E8390_START, E8390_CMD},
 		};
  
-		for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+		for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 			outb_p(program_seq[i].value, base_addr +
 				program_seq[i].offset);
  
@@ -307,7 +307,7 @@
 			{0x00,	EN0_RSARHI},
 			{E8390_RREAD+E8390_START, E8390_CMD},
 		};
-		for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+		for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 			outb(program_seq[i].value, ioaddr + program_seq[i].offset);
  
 	}
@@ -1119,7 +1119,7 @@
 	{NETXEN_BRDTYPE_P2_SB31_2G, 2, "Dual Gb"},
 };
  
-#define NUM_SUPPORTED_BOARDS (sizeof(netxen_boards)/sizeof(struct netxen_brdinfo))
+#define NUM_SUPPORTED_BOARDS ARRAY_SIZE(netxen_boards)
  
 static inline void get_brd_port_by_type(u32 type, int *ports)
 {
@@ -569,7 +569,7 @@
 	/* if the flash size less than 4Mb, make huge war cry and die */
 	for (j = 1; j < 4; j++) {
 		addr = j * NETXEN_NIC_WINDOW_MARGIN;
-		for (i = 0; i < (sizeof(locs) / sizeof(locs[0])); i++) {
+		for (i = 0; i < ARRAY_SIZE(locs); i++) {
 			if (netxen_rom_fast_read(adapter, locs[i], &val01) == 0
 			    && netxen_rom_fast_read(adapter, (addr + locs[i]),
 						    &val02) == 0) {
@@ -232,7 +232,7 @@
     axnet_reset_8390(dev);
     mdelay(10);
  
-    for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+    for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 	outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
  
     for (i = 0; i < 6; i += 2) {
@@ -207,7 +207,7 @@
     { /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 }
 };
  
-#define NR_INFO		(sizeof(hw_info)/sizeof(hw_info_t))
+#define NR_INFO		ARRAY_SIZE(hw_info)
  
 static hw_info_t default_info = { 0, 0, 0, 0, 0 };
 static hw_info_t dl10019_info = { 0, 0, 0, 0, IS_DL10019|HAS_MII };
@@ -374,7 +374,7 @@
     pcnet_reset_8390(dev);
     mdelay(10);
  
-    for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
+    for (i = 0; i < ARRAY_SIZE(program_seq); i++)
 	outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
  
     for (i = 0; i < 32; i++)
@@ -204,7 +204,7 @@
 	},
 };
  
-#define MAX_NUM_SETTINGS (sizeof(settings)/sizeof(struct phy_setting))
+#define MAX_NUM_SETTINGS ARRAY_SIZE(settings)
  
 /**
  * phy_find_setting - find a PHY settings array entry that matches speed & duplex
@@ -1654,7 +1654,7 @@
 	{ SMT_P4053,	0,	SWAP_SMT_P4053			} ,
 } ;
  
-#define N_SMT_PLEN	(sizeof(smt_pdef)/sizeof(smt_pdef[0]))
+#define N_SMT_PLEN	ARRAY_SIZE(smt_pdef)
  
 int smt_check_para(struct s_smc *smc, struct smt_header	*sm,
 		   const u_short list[])
@@ -43,7 +43,7 @@
 static void smt_send_srf(struct s_smc *smc);
 static struct s_srf_evc *smt_get_evc(struct s_smc *smc, int code, int index);
  
-#define MAX_EVCS	(sizeof(smc->evcs)/sizeof(smc->evcs[0]))
+#define MAX_EVCS	ARRAY_SIZE(smc->evcs)
  
 struct evc_init {
 	u_char code ;
@@ -67,7 +67,7 @@
 	{ SMT_EVENT_PORT_PATH_CHANGE,		INDEX_PORT,NUMPHYS,SMT_P4053 } ,
 } ;
  
-#define MAX_INIT_EVC	(sizeof(evc_inits)/sizeof(evc_inits[0]))
+#define MAX_INIT_EVC	ARRAY_SIZE(evc_inits)
  
 void smt_init_evc(struct s_smc *smc)
 {
@@ -3945,7 +3945,7 @@
 static int
 EISA_signature(char *name, struct device *device)
 {
-    int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *);
+    int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures);
     struct eisa_device *edev;
  
     *name = '\0';
@@ -3966,7 +3966,7 @@
 static int
 PCI_signature(char *name, struct de4x5_private *lp)
 {
-    int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *);
+    int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures);
  
     if (lp->chipset == DC21040) {
 	strcpy(name, "DE434/5");
@@ -5072,7 +5072,7 @@
 {
     struct de4x5_private *lp = netdev_priv(dev);
     u_long iobase = dev->base_addr;
-    int i, j, k, n, limit=sizeof(phy_info)/sizeof(struct phy_table);
+    int i, j, k, n, limit=ARRAY_SIZE(phy_info);
     int id;
  
     lp->active = 0;
@@ -7578,9 +7578,9 @@
  
 static const struct iw_handler_def	airo_handler_def =
 {
-	.num_standard	= sizeof(airo_handler)/sizeof(iw_handler),
-	.num_private	= sizeof(airo_private_handler)/sizeof(iw_handler),
-	.num_private_args = sizeof(airo_private_args)/sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(airo_handler),
+	.num_private	= ARRAY_SIZE(airo_private_handler),
+	.num_private_args = ARRAY_SIZE(airo_private_args),
 	.standard	= airo_handler,
 	.private	= airo_private_handler,
 	.private_args	= airo_private_args,
@@ -3976,9 +3976,9 @@
  
 const struct iw_handler_def hostap_iw_handler_def =
 {
-	.num_standard	= sizeof(prism2_handler) / sizeof(iw_handler),
-	.num_private	= sizeof(prism2_private_handler) / sizeof(iw_handler),
-	.num_private_args = sizeof(prism2_priv) / sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(prism2_handler),
+	.num_private	= ARRAY_SIZE(prism2_private_handler),
+	.num_private_args = ARRAY_SIZE(prism2_priv),
 	.standard	= (iw_handler *) prism2_handler,
 	.private	= (iw_handler *) prism2_private_handler,
 	.private_args	= (struct iw_priv_args *) prism2_priv,
@@ -8277,10 +8277,9 @@
  
 static struct iw_handler_def ipw2100_wx_handler_def = {
 	.standard = ipw2100_wx_handlers,
-	.num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
-	.num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
-	.num_private_args = sizeof(ipw2100_private_args) /
-	    sizeof(struct iw_priv_args),
+	.num_standard = ARRAY_SIZE(ipw2100_wx_handlers),
+	.num_private = ARRAY_SIZE(ipw2100_private_handler),
+	.num_private_args = ARRAY_SIZE(ipw2100_private_args),
 	.private = (iw_handler *) ipw2100_private_handler,
 	.private_args = (struct iw_priv_args *)ipw2100_private_args,
 	.get_wireless_stats = ipw2100_wx_wireless_stats,
@@ -123,28 +123,28 @@
 static struct region_cfp_table region_cfp_table[] = {
 	{0x10,			/*US FCC */
 	 channel_freq_power_US_BG,
-	 sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_US_BG),
 	 }
 	,
 	{0x20,			/*CANADA IC */
 	 channel_freq_power_US_BG,
-	 sizeof(channel_freq_power_US_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_US_BG),
 	 }
 	,
 	{0x30, /*EU*/ channel_freq_power_EU_BG,
-	 sizeof(channel_freq_power_EU_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_EU_BG),
 	 }
 	,
 	{0x31, /*SPAIN*/ channel_freq_power_SPN_BG,
-	 sizeof(channel_freq_power_SPN_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_SPN_BG),
 	 }
 	,
 	{0x32, /*FRANCE*/ channel_freq_power_FR_BG,
-	 sizeof(channel_freq_power_FR_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_FR_BG),
 	 }
 	,
 	{0x40, /*JAPAN*/ channel_freq_power_JPN_BG,
-	 sizeof(channel_freq_power_JPN_BG) / sizeof(struct chan_freq_power),
+	 ARRAY_SIZE(channel_freq_power_JPN_BG),
 	 }
 	,
 /*Add new region here */
@@ -1422,7 +1422,7 @@
  
 	lbs_deb_enter(LBS_DEB_MAIN);
  
-	end = sizeof(region_cfp_table)/sizeof(struct region_cfp_table);
+	end = ARRAY_SIZE(region_cfp_table);
  
 	for (i = 0; i < end ; i++) {
 		lbs_deb_main("region_cfp_table[i].region=%d\n",
@@ -2149,13 +2149,13 @@
 	(iw_handler) NULL,		/* SIOCSIWPMKSA */
 };
 struct iw_handler_def libertas_handler_def = {
-	.num_standard	= sizeof(wlan_handler) / sizeof(iw_handler),
+	.num_standard	= ARRAY_SIZE(wlan_handler),
 	.standard	= (iw_handler *) wlan_handler,
 	.get_wireless_stats = wlan_get_wireless_stats,
 };
  
 struct iw_handler_def mesh_handler_def = {
-	.num_standard	= sizeof(mesh_wlan_handler) / sizeof(iw_handler),
+	.num_standard	= ARRAY_SIZE(mesh_wlan_handler),
 	.standard	= (iw_handler *) mesh_wlan_handler,
 	.get_wireless_stats = wlan_get_wireless_stats,
 };
@@ -709,9 +709,9 @@
  
 static const struct iw_handler_def	netwave_handler_def =
 {
-	.num_standard	= sizeof(netwave_handler)/sizeof(iw_handler),
-	.num_private	= sizeof(netwave_private_handler)/sizeof(iw_handler),
-	.num_private_args = sizeof(netwave_private_args)/sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(netwave_handler),
+	.num_private	= ARRAY_SIZE(netwave_private_handler),
+	.num_private_args = ARRAY_SIZE(netwave_private_args),
 	.standard	= (iw_handler *) netwave_handler,
 	.private	= (iw_handler *) netwave_private_handler,
 	.private_args	= (struct iw_priv_args *) netwave_private_args,
@@ -3239,10 +3239,9 @@
 };
  
 const struct iw_handler_def prism54_handler_def = {
-	.num_standard = sizeof (prism54_handler) / sizeof (iw_handler),
-	.num_private = sizeof (prism54_private_handler) / sizeof (iw_handler),
-	.num_private_args =
-	    sizeof (prism54_private_args) / sizeof (struct iw_priv_args),
+	.num_standard = ARRAY_SIZE(prism54_handler),
+	.num_private = ARRAY_SIZE(prism54_private_handler),
+	.num_private_args = ARRAY_SIZE(prism54_private_args),
 	.standard = (iw_handler *) prism54_handler,
 	.private = (iw_handler *) prism54_private_handler,
 	.private_args = (struct iw_priv_args *) prism54_private_args,
@@ -1567,9 +1567,9 @@
  
 static const struct iw_handler_def	ray_handler_def =
 {
-	.num_standard	= sizeof(ray_handler)/sizeof(iw_handler),
-	.num_private	= sizeof(ray_private_handler)/sizeof(iw_handler),
-	.num_private_args = sizeof(ray_private_args)/sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(ray_handler),
+	.num_private	= ARRAY_SIZE(ray_private_handler),
+	.num_private_args = ARRAY_SIZE(ray_private_args),
 	.standard	= ray_handler,
 	.private	= ray_private_handler,
 	.private_args	= ray_private_args,
@@ -2400,9 +2400,9 @@
  
 static const struct iw_handler_def	wavelan_handler_def =
 {
-	.num_standard	= sizeof(wavelan_handler)/sizeof(iw_handler),
-	.num_private	= sizeof(wavelan_private_handler)/sizeof(iw_handler),
-	.num_private_args = sizeof(wavelan_private_args)/sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(wavelan_handler),
+	.num_private	= ARRAY_SIZE(wavelan_private_handler),
+	.num_private_args = ARRAY_SIZE(wavelan_private_args),
 	.standard	= wavelan_handler,
 	.private	= wavelan_private_handler,
 	.private_args	= wavelan_private_args,
@@ -2719,9 +2719,9 @@
  
 static const struct iw_handler_def	wavelan_handler_def =
 {
-	.num_standard	= sizeof(wavelan_handler)/sizeof(iw_handler),
-	.num_private	= sizeof(wavelan_private_handler)/sizeof(iw_handler),
-	.num_private_args = sizeof(wavelan_private_args)/sizeof(struct iw_priv_args),
+	.num_standard	= ARRAY_SIZE(wavelan_handler),
+	.num_private	= ARRAY_SIZE(wavelan_private_handler),
+	.num_private_args = ARRAY_SIZE(wavelan_private_args),
 	.standard	= wavelan_handler,
 	.private	= wavelan_private_handler,
 	.private_args	= wavelan_private_args,
@@ -1893,7 +1893,7 @@
 };
  
 static const struct iw_handler_def wl3501_handler_def = {
-	.num_standard	= sizeof(wl3501_handler) / sizeof(iw_handler),
+	.num_standard	= ARRAY_SIZE(wl3501_handler),
 	.standard	= (iw_handler *)wl3501_handler,
 	.get_wireless_stats = wl3501_get_wireless_stats,
 };
@@ -190,7 +190,7 @@
 	    {0x00,	NE_EN0_RSARHI},
 	    {E8390_RREAD+E8390_START, NE_CMD},
 	};
-	for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(program_seq); i++) {
 	    z_writeb(program_seq[i].value, ioaddr + program_seq[i].offset);
 	}
     }
...	...	@@ -246,7 +246,7 @@
246	246	{0x00, NE_EN0_RSARHI},
247	247	{E8390_RREAD+E8390_START, NE_CMD},
248	248	};
249		- for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++) {
	249	+ for (i = 0; i < ARRAY_SIZE(program_seq); i++) {
250	250	outb(program_seq[i].value, ioaddr + program_seq[i].offset);
251	251	}
252	252
...	...	@@ -414,7 +414,7 @@
414	414	/*
415	415	* Update the multicast hash table
416	416	*/
417		- for (i = 0; i < sizeof(multi_hash) / sizeof(multi_hash[0]); i++)
	417	+ for (i = 0; i < ARRAY_SIZE(multi_hash); i++)
418	418	write_rreg(dev->base_addr, i + LADRL, multi_hash[i]);
419	419
420	420	/*
...	...	@@ -263,7 +263,7 @@
263	263	(highest byte stripped) */
264	264	};
265	265
266		-#define N_LANCE_ADDR (sizeof(lance_addr_list)/sizeof(*lance_addr_list))
	266	+#define N_LANCE_ADDR ARRAY_SIZE(lance_addr_list)
267	267
268	268
269	269	/* Definitions for the Lance */
...	...	@@ -603,7 +603,7 @@
603	603
604	604	static void atl1_init_flash_opcode(struct atl1_hw *hw)
605	605	{
606		- if (hw->flash_vendor >= sizeof(flash_table) / sizeof(flash_table[0]))
	606	+ if (hw->flash_vendor >= ARRAY_SIZE(flash_table))
607	607	hw->flash_vendor = 0; /* ATMEL */
608	608
609	609	/* Init OP table */
...	...	@@ -3492,7 +3492,7 @@
3492	3492	/* Determine the selected interface. */
3493	3493	val = REG_RD(bp, BNX2_NVM_CFG1);
3494	3494
3495		- entry_count = sizeof(flash_table) / sizeof(struct flash_spec);
	3495	+ entry_count = ARRAY_SIZE(flash_table);
3496	3496
3497	3497	if (val & 0x40000000) {
3498	3498
...	...	@@ -805,7 +805,7 @@
805	805	i = cs8900_irq_map[0];
806	806	#else
807	807	/* Translate the IRQ using the IRQ mapping table. */
808		- if (i >= sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]))
	808	+ if (i >= ARRAY_SIZE(cs8900_irq_map))
809	809	printk("\ncs89x0: invalid ISA interrupt number %d\n", i);
810	810	else
811	811	i = cs8900_irq_map[i];
812	812
...	...	@@ -1246,11 +1246,11 @@
1246	1246
1247	1247	if (chip_type == CS8900) {
1248	1248	/* Search the mapping table for the corresponding IRQ pin. */
1249		- for (i = 0; i != sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]); i++)
	1249	+ for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++)
1250	1250	if (cs8900_irq_map[i] == irq)
1251	1251	break;
1252	1252	/* Not found */
1253		- if (i == sizeof(cs8900_irq_map)/sizeof(cs8900_irq_map[0]))
	1253	+ if (i == ARRAY_SIZE(cs8900_irq_map))
1254	1254	i = 3;
1255	1255	writereg(dev, PP_CS8900_ISAINT, i);
1256	1256	} else {
...	...	@@ -106,8 +106,7 @@
106	106	};
107	107
108	108	#define E1000_QUEUE_STATS_LEN 0
109		-#define E1000_GLOBAL_STATS_LEN \
110		- sizeof(e1000_gstrings_stats) / sizeof(struct e1000_stats)
	109	+#define E1000_GLOBAL_STATS_LEN ARRAY_SIZE(e1000_gstrings_stats)
111	110	#define E1000_STATS_LEN (E1000_GLOBAL_STATS_LEN + E1000_QUEUE_STATS_LEN)
112	111	static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = {
113	112	"Register test (offline)", "Eeprom test (offline)",
...	...	@@ -308,12 +308,11 @@
308	308	return -1;
309	309	}
310	310
311		- for (i = 0, phy = phy_info; i < sizeof(phy_info) / sizeof(phy_info[0]);
312		- i++, phy++)
	311	+ for (i = 0, phy = phy_info; i < ARRAY_SIZE(phy_info); i++, phy++)
313	312	if (phy->id == (phy_hwid >> 4) \|\| phy->id == 0)
314	313	break;
315	314
316		- if (i >= sizeof(phy_info) / sizeof(phy_info[0])) {
	315	+ if (i >= ARRAY_SIZE(phy_info)) {
317	316	printk(KERN_ERR DRV_MODULE_NAME
318	317	": %s PHY id 0x%08x is not supported!\n",
319	318	dev->name, phy_hwid);
...	...	@@ -132,7 +132,7 @@
132	132	{
133	133	unsigned long flags;
134	134
135		- if (idx >= sizeof(__emacs) / sizeof(__emacs[0])) {
	135	+ if (idx >= ARRAY_SIZE(__emacs)) {
136	136	printk(KERN_WARNING
137	137	"invalid index %d when registering EMAC for debugging\n",
138	138	idx);
...	...	@@ -148,7 +148,7 @@
148	148	{
149	149	unsigned long flags;
150	150
151		- if (idx >= sizeof(__mals) / sizeof(__mals[0])) {
	151	+ if (idx >= ARRAY_SIZE(__mals)) {
152	152	printk(KERN_WARNING
153	153	"invalid index %d when registering MAL for debugging\n",
154	154	idx);
155	155
...	...	@@ -167,11 +167,11 @@
167	167
168	168	local_irq_save(flags);
169	169
170		- for (i = 0; i < sizeof(__mals) / sizeof(__mals[0]); ++i)
	170	+ for (i = 0; i < ARRAY_SIZE(__mals); ++i)
171	171	if (__mals[i])
172	172	emac_mal_dump(__mals[i]);
173	173
174		- for (i = 0; i < sizeof(__emacs) / sizeof(__emacs[0]); ++i)
	174	+ for (i = 0; i < ARRAY_SIZE(__emacs); ++i)
175	175	if (__emacs[i])
176	176	emac_mac_dump(i, __emacs[i]);
177	177
...	...	@@ -67,7 +67,7 @@
67	67	/* Note : the 220L doesn't support 38400, but we will fix that below */
68	68	static unsigned baud_rates[] = { 9600, 19200, 57600, 115200, 38400 };
69	69
70		-#define MAX_SPEEDS (sizeof(baud_rates)/sizeof(baud_rates[0]))
	70	+#define MAX_SPEEDS ARRAY_SIZE(baud_rates)
71	71
72	72	static struct dongle_driver act220l = {
73	73	.owner = THIS_MODULE,