drivers/net/*.c: Use static const

Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 1776ab6..9e1c03e 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -158,8 +158,8 @@ static int mem_start;
 struct net_device * __init el1_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-       static unsigned ports[] = { 0x280, 0x300, 0};
-       unsigned *port;
+       static const unsigned ports[] = { 0x280, 0x300, 0};
+       const unsigned *port;
        int err = 0;
 
        if (!dev)

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 4777a1c..d84f6e8 100644 (file)
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -392,8 +392,8 @@ el2_open(struct net_device *dev)
     int retval;
 
     if (dev->irq < 2) {
-       int irqlist[] = {5, 9, 3, 4, 0};
-       int *irqp = irqlist;
+       static const int irqlist[] = {5, 9, 3, 4, 0};
+       const int *irqp = irqlist;
 
        outb(EGACFR_NORM, E33G_GACFR);  /* Enable RAM and interrupts. */
        do {

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 475a66d..1e94555 100644 (file)
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -311,8 +311,8 @@ static int mem_start;
 struct net_device * __init el16_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
-       static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
-       unsigned *port;
+       static const unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
+       const unsigned *port;
        int err = -ENODEV;
 
        if (!dev)

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 013b7c3..8c094ba 100644 (file)
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -317,13 +317,13 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
        u8 POS;
        u32 base;
        struct mc32_local *lp = netdev_priv(dev);
-       static u16 mca_io_bases[]={
+       static const u16 mca_io_bases[] = {
                0x7280,0x7290,
                0x7680,0x7690,
                0x7A80,0x7A90,
                0x7E80,0x7E90
        };
-       static u32 mca_mem_bases[]={
+       static const u32 mca_mem_bases[] = {
                0x00C0000,
                0x00C4000,
                0x00C8000,
@@ -333,7 +333,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
                0x00D8000,
                0x00DC000
        };
-       static char *failures[]={
+       static const char * const failures[] = {
                "Processor instruction",
                "Processor data bus",
                "Processor data bus",

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 871b163..f4744fc 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -270,9 +270,9 @@ static const struct net_device_ops at1700_netdev_ops = {
 
 static int __init at1700_probe1(struct net_device *dev, int ioaddr)
 {
-       char fmv_irqmap[4] = {3, 7, 10, 15};
-       char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
-       char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
+       static const char fmv_irqmap[4] = {3, 7, 10, 15};
+       static const char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
+       static const char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
        unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
        int slot, ret = -ENODEV;
        struct net_local *lp = netdev_priv(dev);

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5c811f3..819b55c 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6811,28 +6811,30 @@ bnx2_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
        u32 *p = _p, i, offset;
        u8 *orig_p = _p;
        struct bnx2 *bp = netdev_priv(dev);
-       u32 reg_boundaries[] = { 0x0000, 0x0098, 0x0400, 0x045c,
-                                0x0800, 0x0880, 0x0c00, 0x0c10,
-                                0x0c30, 0x0d08, 0x1000, 0x101c,
-                                0x1040, 0x1048, 0x1080, 0x10a4,
-                                0x1400, 0x1490, 0x1498, 0x14f0,
-                                0x1500, 0x155c, 0x1580, 0x15dc,
-                                0x1600, 0x1658, 0x1680, 0x16d8,
-                                0x1800, 0x1820, 0x1840, 0x1854,
-                                0x1880, 0x1894, 0x1900, 0x1984,
-                                0x1c00, 0x1c0c, 0x1c40, 0x1c54,
-                                0x1c80, 0x1c94, 0x1d00, 0x1d84,
-                                0x2000, 0x2030, 0x23c0, 0x2400,
-                                0x2800, 0x2820, 0x2830, 0x2850,
-                                0x2b40, 0x2c10, 0x2fc0, 0x3058,
-                                0x3c00, 0x3c94, 0x4000, 0x4010,
-                                0x4080, 0x4090, 0x43c0, 0x4458,
-                                0x4c00, 0x4c18, 0x4c40, 0x4c54,
-                                0x4fc0, 0x5010, 0x53c0, 0x5444,
-                                0x5c00, 0x5c18, 0x5c80, 0x5c90,
-                                0x5fc0, 0x6000, 0x6400, 0x6428,
-                                0x6800, 0x6848, 0x684c, 0x6860,
-                                0x6888, 0x6910, 0x8000 };
+       static const u32 reg_boundaries[] = {
+               0x0000, 0x0098, 0x0400, 0x045c,
+               0x0800, 0x0880, 0x0c00, 0x0c10,
+               0x0c30, 0x0d08, 0x1000, 0x101c,
+               0x1040, 0x1048, 0x1080, 0x10a4,
+               0x1400, 0x1490, 0x1498, 0x14f0,
+               0x1500, 0x155c, 0x1580, 0x15dc,
+               0x1600, 0x1658, 0x1680, 0x16d8,
+               0x1800, 0x1820, 0x1840, 0x1854,
+               0x1880, 0x1894, 0x1900, 0x1984,
+               0x1c00, 0x1c0c, 0x1c40, 0x1c54,
+               0x1c80, 0x1c94, 0x1d00, 0x1d84,
+               0x2000, 0x2030, 0x23c0, 0x2400,
+               0x2800, 0x2820, 0x2830, 0x2850,
+               0x2b40, 0x2c10, 0x2fc0, 0x3058,
+               0x3c00, 0x3c94, 0x4000, 0x4010,
+               0x4080, 0x4090, 0x43c0, 0x4458,
+               0x4c00, 0x4c18, 0x4c40, 0x4c54,
+               0x4fc0, 0x5010, 0x53c0, 0x5444,
+               0x5c00, 0x5c18, 0x5c80, 0x5c90,
+               0x5fc0, 0x6000, 0x6400, 0x6428,
+               0x6800, 0x6848, 0x684c, 0x6860,
+               0x6888, 0x6910, 0x8000
+       };
 
        regs->version = 0;
 

diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index 06e72fb..94ec973 100644 (file)
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -216,7 +216,7 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr)
                printk(" %02X", station_addr[i]);
 
        if (dev->irq < 2) {
-               int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4};
+               static const int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4};
                for (i = 0; i < ARRAY_SIZE(irqlist); i++)
                        if (request_irq (irqlist[i], NULL, 0, "bogus", NULL) != -EBUSY) {
                                dev->irq = irqlist[i];

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 9e19fbc..4fa8d2a 100644 (file)
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -891,12 +891,13 @@ err:
    there is non-reboot way to recover if something goes wrong.
    */
 
-static char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
-static char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
+static const char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
+static const char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
 static int     eepro_grab_irq(struct net_device *dev)
 {
-       int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
-       int *irqp = irqlist, temp_reg, ioaddr = dev->base_addr;
+       static const int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
+       const int *irqp = irqlist;
+       int temp_reg, ioaddr = dev->base_addr;
 
        eepro_sw2bank1(ioaddr); /* be CAREFUL, BANK 1 now */
 

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 12c37d2..48ee51b 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1103,7 +1103,7 @@ static int __init eexp_hw_probe(struct net_device *dev, unsigned short ioaddr)
                dev->dev_addr[i] = ((unsigned char *)hw_addr)[5-i];
 
        {
-               static char irqmap[]={0, 9, 3, 4, 5, 10, 11, 0};
+               static const char irqmap[] = { 0, 9, 3, 4, 5, 10, 11, 0 };
                unsigned short setupval = eexp_hw_readeeprom(ioaddr,0);
 
                /* Use the IRQ from EEPROM if none was given */

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index d1bec62..45c4b7b 100644 (file)
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -143,7 +143,8 @@ void gfar_halt(struct net_device *dev);
 static void gfar_halt_nodisable(struct net_device *dev);
 void gfar_start(struct net_device *dev);
 static void gfar_clear_exact_match(struct net_device *dev);
-static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
+static void gfar_set_mac_for_addr(struct net_device *dev, int num,
+                                 const u8 *addr);
 static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 
 MODULE_AUTHOR("Freescale Semiconductor, Inc");
@@ -3094,10 +3095,10 @@ static void gfar_set_multi(struct net_device *dev)
 static void gfar_clear_exact_match(struct net_device *dev)
 {
        int idx;
-       u8 zero_arr[MAC_ADDR_LEN] = {0,0,0,0,0,0};
+       static const u8 zero_arr[MAC_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
 
        for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
-               gfar_set_mac_for_addr(dev, idx, (u8 *)zero_arr);
+               gfar_set_mac_for_addr(dev, idx, zero_arr);
 }
 
 /* Set the appropriate hash bit for the given addr */
@@ -3132,7 +3133,8 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
 /* There are multiple MAC Address register pairs on some controllers
  * This function sets the numth pair to a given address
  */
-static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr)
+static void gfar_set_mac_for_addr(struct net_device *dev, int num,
+                                 const u8 *addr)
 {
        struct gfar_private *priv = netdev_priv(dev);
        struct gfar __iomem *regs = priv->gfargrp[0].regs;

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index d15d2f2..ef20143 100644 (file)
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -162,9 +162,9 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
 
        /* Snarf the interrupt now.  Someday this could be moved to open(). */
        if (dev->irq < 2) {
-               int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
-               int irq_8list[] = { 7, 5, 3, 4, 9, 0};
-               int *irqp = wordmode ? irq_16list : irq_8list;
+               static const int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
+               static const int irq_8list[] = { 7, 5, 3, 4, 9, 0};
+               const int *irqp = wordmode ? irq_16list : irq_8list;
                do {
                        int irq = *irqp;
                        if (request_irq (irq, NULL, 0, "bogus", NULL) != -EBUSY) {

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 2411e72..e97ebef 100644 (file)
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -135,7 +135,7 @@ jme_reset_phy_processor(struct jme_adapter *jme)
 
 static void
 jme_setup_wakeup_frame(struct jme_adapter *jme,
-               u32 *mask, u32 crc, int fnr)
+                      const u32 *mask, u32 crc, int fnr)
 {
        int i;
 
@@ -163,7 +163,7 @@ jme_setup_wakeup_frame(struct jme_adapter *jme,
 static inline void
 jme_reset_mac_processor(struct jme_adapter *jme)
 {
-       u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
+       static const u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
        u32 crc = 0xCDCDCDCD;
        u32 gpreg0;
        int i;

diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 37504a3..49ea870 100644 (file)
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -3570,7 +3570,7 @@ static void hw_cfg_wol(struct ksz_hw *hw, u16 frame, int set)
  * This routine is used to program Wake-on-LAN pattern.
  */
 static void hw_set_wol_frame(struct ksz_hw *hw, int i, uint mask_size,
-       u8 *mask, uint frame_size, u8 *pattern)
+       const u8 *mask, uint frame_size, const u8 *pattern)
 {
        int bits;
        int from;
@@ -3626,9 +3626,9 @@ static void hw_set_wol_frame(struct ksz_hw *hw, int i, uint mask_size,
  *
  * This routine is used to add ARP pattern for waking up the host.
  */
-static void hw_add_wol_arp(struct ksz_hw *hw, u8 *ip_addr)
+static void hw_add_wol_arp(struct ksz_hw *hw, const u8 *ip_addr)
 {
-       u8 mask[6] = { 0x3F, 0xF0, 0x3F, 0x00, 0xC0, 0x03 };
+       static const u8 mask[6] = { 0x3F, 0xF0, 0x3F, 0x00, 0xC0, 0x03 };
        u8 pattern[42] = {
                0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3651,8 +3651,8 @@ static void hw_add_wol_arp(struct ksz_hw *hw, u8 *ip_addr)
  */
 static void hw_add_wol_bcast(struct ksz_hw *hw)
 {
-       u8 mask[] = { 0x3F };
-       u8 pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+       static const u8 mask[] = { 0x3F };
+       static const u8 pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
        hw_set_wol_frame(hw, 2, 1, mask, MAC_ADDR_LEN, pattern);
 }
@@ -3669,7 +3669,7 @@ static void hw_add_wol_bcast(struct ksz_hw *hw)
  */
 static void hw_add_wol_mcast(struct ksz_hw *hw)
 {
-       u8 mask[] = { 0x3F };
+       static const u8 mask[] = { 0x3F };
        u8 pattern[] = { 0x33, 0x33, 0xFF, 0x00, 0x00, 0x00 };
 
        memcpy(&pattern[3], &hw->override_addr[3], 3);
@@ -3687,7 +3687,7 @@ static void hw_add_wol_mcast(struct ksz_hw *hw)
  */
 static void hw_add_wol_ucast(struct ksz_hw *hw)
 {
-       u8 mask[] = { 0x3F };
+       static const u8 mask[] = { 0x3F };
 
        hw_set_wol_frame(hw, 0, 1, mask, MAC_ADDR_LEN, hw->override_addr);
 }
@@ -3700,7 +3700,7 @@ static void hw_add_wol_ucast(struct ksz_hw *hw)
  *
  * This routine is used to enable Wake-on-LAN depending on driver settings.
  */
-static void hw_enable_wol(struct ksz_hw *hw, u32 wol_enable, u8 *net_addr)
+static void hw_enable_wol(struct ksz_hw *hw, u32 wol_enable, const u8 *net_addr)
 {
        hw_cfg_wol(hw, KS8841_WOL_MAGIC_ENABLE, (wol_enable & WAKE_MAGIC));
        hw_cfg_wol(hw, KS8841_WOL_FRAME0_ENABLE, (wol_enable & WAKE_UCAST));
@@ -6208,7 +6208,7 @@ static int netdev_set_wol(struct net_device *dev,
        struct dev_info *hw_priv = priv->adapter;
 
        /* Need to find a way to retrieve the device IP address. */
-       u8 net_addr[] = { 192, 168, 1, 1 };
+       static const u8 net_addr[] = { 192, 168, 1, 1 };
 
        if (wol->wolopts & ~hw_priv->wol_support)
                return -EINVAL;
@@ -7241,7 +7241,7 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)
        struct ksz_hw *hw = &hw_priv->hw;
 
        /* Need to find a way to retrieve the device IP address. */
-       u8 net_addr[] = { 192, 168, 1, 1 };
+       static const u8 net_addr[] = { 192, 168, 1, 1 };
 
        for (i = 0; i < hw->dev_count; i++) {
                if (info->netdev[i]) {

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 33618ed..d973fc6 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -388,9 +388,9 @@ static long memend; /* e.g 0xd4000 */
 struct net_device * __init ni52_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(sizeof(struct priv));
-       static int ports[] = {0x300, 0x280, 0x360 , 0x320 , 0x340, 0};
+       static const int ports[] = {0x300, 0x280, 0x360, 0x320, 0x340, 0};
+       const int *port;
        struct priv *p;
-       int *port;
        int err = 0;
 
        if (!dev)

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index da228a0..c75ae85 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -361,8 +361,8 @@ static int dma;
 struct net_device * __init ni65_probe(int unit)
 {
        struct net_device *dev = alloc_etherdev(0);
-       static int ports[] = {0x360,0x300,0x320,0x340, 0};
-       int *port;
+       static const int ports[] = { 0x360, 0x300, 0x320, 0x340, 0 };
+       const int *port;
        int err = 0;
 
        if (!dev)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4e745af..e165d96 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2526,7 +2526,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
 
                val = mdio_read(ioaddr, 0x0d);
                if ((val & 0x00ff) != 0x006c) {
-                       u32 set[] = {
+                       static const u32 set[] = {
                                0x0065, 0x0066, 0x0067, 0x0068,
                                0x0069, 0x006a, 0x006b, 0x006c
                        };

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 50815fb..c149e48 100644 (file)
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -1191,7 +1191,7 @@ static void genesis_init(struct skge_hw *hw)
 
 static void genesis_reset(struct skge_hw *hw, int port)
 {
-       const u8 zero[8]  = { 0 };
+       static const u8 zero[8]  = { 0 };
        u32 reg;
 
        skge_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
@@ -1557,7 +1557,7 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
        int jumbo = hw->dev[port]->mtu > ETH_DATA_LEN;
        int i;
        u32 r;
-       const u8 zero[6]  = { 0 };
+       static const u8 zero[6]  = { 0 };
 
        for (i = 0; i < 10; i++) {
                skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),

diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index d2dd8e6..235a3c6 100644 (file)
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -277,8 +277,12 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
        dev->base_addr = ioaddr+ULTRA_NIC_OFFSET;
 
        {
-               int addr_tbl[4] = {0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000};
-               short num_pages_tbl[4] = {0x20, 0x40, 0x80, 0xff};
+               static const int addr_tbl[4] = {
+                       0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000
+               };
+               static const short num_pages_tbl[4] = {
+                       0x20, 0x40, 0x80, 0xff
+               };
 
                dev->mem_start = ((addr & 0x0f) << 13) + addr_tbl[(addr >> 6) & 3] ;
                num_pages = num_pages_tbl[(addr >> 4) & 3];

diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index f1549ff..8831a33 100644 (file)
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -275,7 +275,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
        dev->base_addr = ioaddr+WD_NIC_OFFSET;
 
        if (dev->irq < 2) {
-               int irqmap[] = {9,3,5,7,10,11,15,4};
+               static const int irqmap[] = {9, 3, 5, 7, 10, 11, 15, 4};
                int reg1 = inb(ioaddr+1);
                int reg4 = inb(ioaddr+4);
                if (ancient || reg1 == 0xff) {  /* Ack!! No way to read the IRQ! */