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>

diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index b073810f9fd84d54a2fb1f873167c12603d0c65f..b5a974a964c2a9b61f0c58293e638ca70e97ce4b 100644 (file)
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -246,7 +246,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
            {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);
        }
 

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 2143eeb7a2b0fdf34143d8c14bfe0a623a5c7894..77964556776e0da36a6c90a90e9981d39f376635 100644 (file)
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -414,7 +414,7 @@ static void am79c961_setmulticastlist (struct net_device *dev)
        /*
         * 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]);
 
        /*

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 97cca505cf903117f51eca3b40576156cf73ad6e..17b9dbf7bd6836322bf3568420844c42d5c9703a 100644 (file)
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -263,7 +263,7 @@ struct lance_addr {
                                                                           (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 */

diff --git a/drivers/net/atl1/atl1_hw.c b/drivers/net/atl1/atl1_hw.c
index ef886bdeac13d5ed689c61bc6da41e8209051704..9d3bd22e3a82f96f289a462b60a9503954cb49a8 100644 (file)
--- a/drivers/net/atl1/atl1_hw.c
+++ b/drivers/net/atl1/atl1_hw.c
@@ -603,7 +603,7 @@ static struct atl1_spi_flash_dev flash_table[] = {
 
 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 */

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 61debba873ac4dedd287f8ca113a6ebb97414a25..f1e7204f78c9f08a8e2a7935957c0860e357a96b 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3492,7 +3492,7 @@ bnx2_init_nvram(struct bnx2 *bp)
        /* 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) {
 

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 2b4c921939124f6786aa12254aaa02a109f5e1e6..4cf82cf5ac100ff6736bab9938d2a34828e85c2f 100644 (file)
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -805,7 +805,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
                        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 @@ write_irq(struct net_device *dev, int chip_type, int irq)
 
        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 {

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 9ecc3adcf6c189117e038426e0fc0550f08f60bd..76d16aaf05b678f0d2d816f33ecdd5cda06d7475 100644 (file)
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -106,8 +106,7 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
 };
 
 #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)",

diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index b3fa0d6a159ce51f5490f16dcae58d03a927fbca..e8e10a02d202948429c4445e535cf6a0ffbb9f49 100644 (file)
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -308,12 +308,11 @@ int fec_mii_phy_id_detect(struct net_device *dev)
                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);

diff --git a/drivers/net/ibm_emac/ibm_emac_debug.c b/drivers/net/ibm_emac/ibm_emac_debug.c
index 92f970d402df85c86bfd8a01d4f6d363373b8d56..1f70906cfb98b79147dfde2cc1beb39d2fe5cdb1 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_debug.c
+++ b/drivers/net/ibm_emac/ibm_emac_debug.c
@@ -132,7 +132,7 @@ void emac_dbg_register(int idx, struct ocp_enet_private *dev)
 {
        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 @@ void mal_dbg_register(int idx, struct ibm_ocp_mal *mal)
 {
        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 @@ void emac_dbg_dump_all(void)
 
        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]);
 

diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
index 9715ab5572e998c11a96121a6fdde28cdce5399e..ccf6ec548a6464a3e51c1945796a0f7842d5977d 100644 (file)
--- a/drivers/net/irda/actisys-sir.c
+++ b/drivers/net/irda/actisys-sir.c
@@ -67,7 +67,7 @@ static int actisys_reset(struct sir_dev *);
 /* 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,

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 0413cd95eda7b28d0a273e82ff2b6b6758b9f89e..21d35bc53906806cb7da85276ff59f3ea42bf716 100644 (file)
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -94,8 +94,7 @@ static struct ixgb_stats ixgb_gstrings_stats[] = {
        {"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)

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 5fc18da1873dcb279edfc8e27d2358cce87be44d..408ae6eb6a8ba676c3931ed0aa53f5d94d27aed5 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -515,8 +515,6 @@ CLEAR_INT(void) {
        outb(0, IOADDR+8);
 }
 
-#define SIZE(x)        (sizeof(x)/sizeof((x)[0]))
-
 #if 0
 /* selftest or dump */
 static void
@@ -532,7 +530,7 @@ i596_port_do(struct net_device *dev, int portcmd, char *cmdname) {
        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]);

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 6317bba9587c3423464a8af2b47f9fe6fc74c336..2a808e265a3ee3622349e5134ed03e3002ac5a07 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2680,8 +2680,7 @@ static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
        { "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)

diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index a0f35361fbec59fe08dcd4e5b234e92423f78307..2b85d1b53344a3027ff95d32b82217c8aca43eeb 100644 (file)
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -257,7 +257,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
                        {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);
 
        }

diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index c81befc3a7ae6efe894a9657514834b0610bf3a8..27d87985bb63f3912ca333c61360253ac74a8994 100644 (file)
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -375,7 +375,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
                        {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);
 
        }

diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index d1a4b8d7122a6dd05ee715afdd8750370ab25e91..f73073b1218a1573b6fbea1909af55aac0f3283a 100644 (file)
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -430,7 +430,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
                        {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);
 

diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 230a0f1e03fbdc2ddcc089ae5b93716199e426ba..7ec362b2e3e50bf6557d46b340e876d05437aafa 100644 (file)
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -307,7 +307,7 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
                        {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);
 
        }

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index aaa34939485beeb78150efb946624e281c2f95e4..7bbd5d14175fedfe434d88534511b458b99e9332 100644 (file)
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -1119,7 +1119,7 @@ static const struct netxen_brdinfo netxen_boards[] = {
        {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)
 {

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index a7b8d7f23259ced85ce9a5925c68dd5e3235dea5..2c19b8df98fab06c205d26afbf513b019856e670 100644 (file)
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -569,7 +569,7 @@ int netxen_is_flash_supported(struct netxen_adapter *adapter)
        /* 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) {

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index a9db59d2a2f1411498dbdb9959aaa4e29b09ef93..28eea206766d9916035c97dd2e271cb9e6dd12d7 100644 (file)
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -232,7 +232,7 @@ static int get_prom(struct pcmcia_device *link)
     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) {

diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 49857c1b5067c54d140cf3ab0b797c730d6667c9..8ce251cd32094cba95791cf8b54159d8be7be1cb 100644 (file)
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -207,7 +207,7 @@ static hw_info_t hw_info[] = {
     { /* 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 @@ static hw_info_t *get_prom(struct pcmcia_device *link)
     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++)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index cb230f44d6fc3418cd899c42a76552a0091e9ee4..17c1e1555d8018737e3030f1b245d6a61f1b46e9 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -204,7 +204,7 @@ static const struct phy_setting settings[] = {
        },
 };
 
-#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

diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 75afc1f07ba0ab2b70d263738759cb30c9b52fa9..ced2c8f76be711f773881d1718405a9367752762 100644 (file)
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1654,7 +1654,7 @@ static const struct smt_pdef {
        { 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[])

diff --git a/drivers/net/skfp/srf.c b/drivers/net/skfp/srf.c
index 16573aca8b6268dda579c96117439f3475fcda70..6caf713b744c59aab2c81d724f99ca0e8096178e 100644 (file)
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/skfp/srf.c
@@ -43,7 +43,7 @@ static void clear_reported(struct s_smc *smc);
 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 @@ static const struct evc_init evc_inits[] = {
        { 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)
 {

diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index ba7f47c2dcffa750636a2630a01a97d26e5c7311..ee4215ca63f0722f58949fa24995a62132527661 100644 (file)
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -3945,7 +3945,7 @@ create_packet(struct net_device *dev, char *frame, int len)
 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 @@ EISA_signature(char *name, struct device *device)
 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 @@ mii_get_phy(struct net_device *dev)
 {
     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;

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 80ae7599953630e6efa241c60d3b91565d4df18b..7d717c4d9845e98e5e8ab5cdb2faed78cacd6bbf 100644 (file)
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7578,9 +7578,9 @@ static const iw_handler           airo_private_handler[] =
 
 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,

diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index d58ac84f4e9e3bc4124d0d0dd62e70026a233990..730b3541e325d395e070918e4b7533b86b4e52f3 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -3976,9 +3976,9 @@ static const iw_handler prism2_private_handler[] =
 
 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,

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 12a6887cb9f1a046e1fbe01e3a792eab439fd6c5..b3c07b93afce74f27c13ac0fb0b98a53f5ff049b 100644 (file)
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -8277,10 +8277,9 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
 
 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,

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index cb0359df355ec7ca1c60dfb1f02046ab6e15ded9..a54171af7b97c27dd02706da374feabb24609b7f 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -123,28 +123,28 @@ struct region_cfp_table {
 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 @@ struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *c
 
        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",

diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 3f628223bc6cc60eb0a1d4d37931d51cdf75aae8..f8036efd72940b35b76d275f82f12e6aeb1456a0 100644 (file)
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2149,13 +2149,13 @@ static const iw_handler mesh_wlan_handler[] = {
        (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,
 };

diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 389fdd313c7ee718510c1d766124a9ac0ae4339b..d8a59afa7178b2a4f5d8ea4f159f5834fdce70ad 100644 (file)
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -709,9 +709,9 @@ static const iw_handler             netwave_private_handler[] =
 
 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,

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index f1066614dc313bfc4e7cf134fdceaaf6f6b4cbeb..77ea13bf0c029965d8538af586755273d37d51a7 100644 (file)
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -3239,10 +3239,9 @@ static const iw_handler prism54_private_handler[] = {
 };
 
 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,

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1b0e9707049a7048c150c527c97f5709e0799f17..429bca8d0b5f07a0d407d785d6ad66cde657eb8e 100644 (file)
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1567,9 +1567,9 @@ static const struct iw_priv_args  ray_private_args[] = {
 
 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,

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index b876bf65935b8fd3373b4ffef0cfa599e12046e3..33ed9fe95f3db61661d535bc0a37f8afe30f142c 100644 (file)
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -2400,9 +2400,9 @@ static const struct iw_priv_args wavelan_private_args[] = {
 
 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,

diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 1cc5180ab1e78a3ca4433ae8ca5b16df03977b7e..9b7f44957869b89970826f4b24affe3a0cd8d889 100644 (file)
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -2719,9 +2719,9 @@ static const iw_handler           wavelan_private_handler[] =
 
 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,

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index cfde68cff94c3cf8dfe6bfab5d81a9e3a64c9f03..2690f291e3f78288fbdb852a252a9a5583e4ba5f 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1893,7 +1893,7 @@ static const iw_handler   wl3501_handler[] = {
 };
 
 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,
 };

diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index a45f9952a3f7610b393d6107197e60f44bb3e1ca..fb215eb6dcf304ea6d722ff2f28104c3bcb98ba3 100644 (file)
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -190,7 +190,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
            {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);
        }
     }