7 files changed, 32 insertions, 33 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 2c2ed6dc98bc..6c192650d349 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -406,7 +406,7 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl);
 #define DEF_STAT                (2 * TICKS_PER_SEC)
 
 
-static int link[ACE_MAX_MOD_PARMS];
+static int link_state[ACE_MAX_MOD_PARMS];
 static int trace[ACE_MAX_MOD_PARMS];
 static int tx_coal_tick[ACE_MAX_MOD_PARMS];
 static int rx_coal_tick[ACE_MAX_MOD_PARMS];
@@ -419,7 +419,7 @@ MODULE_AUTHOR("Jes Sorensen <jes@trained-monkey.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("AceNIC/3C985/GA620 Gigabit Ethernet driver");
 
-module_param_array(link, int, NULL, 0);
+module_param_array_named(link, link_state, int, NULL, 0);
 module_param_array(trace, int, NULL, 0);
 module_param_array(tx_coal_tick, int, NULL, 0);
 module_param_array(max_tx_desc, int, NULL, 0);
@@ -987,27 +987,27 @@ static int __devinit ace_init(struct net_device *dev)
 
         mac1 = 0;
         for(i = 0; i < 4; i++) {
-                int tmp;
+                int t;
 
                 mac1 = mac1 << 8;
-                tmp = read_eeprom_byte(dev, 0x8c+i);
-                if (tmp < 0) {
+                t = read_eeprom_byte(dev, 0x8c+i);
+                if (t < 0) {
                         ecode = -EIO;
                         goto init_error;
                 } else
-                        mac1 |= (tmp & 0xff);
+                        mac1 |= (t & 0xff);
         }
         mac2 = 0;
         for(i = 4; i < 8; i++) {
-                int tmp;
+                int t;
 
                 mac2 = mac2 << 8;
-                tmp = read_eeprom_byte(dev, 0x8c+i);
-                if (tmp < 0) {
+                t = read_eeprom_byte(dev, 0x8c+i);
+                if (t < 0) {
                         ecode = -EIO;
                         goto init_error;
                 } else
-                        mac2 |= (tmp & 0xff);
+                        mac2 |= (t & 0xff);
         }
 
         writel(mac1, &regs->MacAddrHi);
@@ -1305,10 +1305,10 @@ static int __devinit ace_init(struct net_device *dev)
         writel(TX_RING_BASE, &regs->WinBase);
 
         if (ACE_IS_TIGON_I(ap)) {
-                ap->tx_ring = (struct tx_desc *) regs->Window;
+                ap->tx_ring = (__force struct tx_desc *) regs->Window;
                 for (i = 0; i < (TIGON_I_TX_RING_ENTRIES
                                  * sizeof(struct tx_desc)) / sizeof(u32); i++)
-                        writel(0, (void __iomem *)ap->tx_ring  + i * 4);
+                        writel(0, (__force void __iomem *)ap->tx_ring  + i * 4);
 
                 set_aceaddr(&info->tx_ctrl.rngptr, TX_RING_BASE);
         } else {
@@ -1394,8 +1394,8 @@ static int __devinit ace_init(struct net_device *dev)
         /*
          * Override link default parameters
          */
-        if ((board_idx >= 0) && link[board_idx]) {
-                int option = link[board_idx];
+        if ((board_idx >= 0) && link_state[board_idx]) {
+                int option = link_state[board_idx];
 
                 tmp = LNK_ENABLE;
 
@@ -2383,8 +2383,9 @@ static int ace_close(struct net_device *dev)
 
                 if (mapping) {
                         if (ACE_IS_TIGON_I(ap)) {
-                                struct tx_desc __iomem *tx
-                                        = (struct tx_desc __iomem *) &ap->tx_ring[i];
+                                /* NB: TIGON_1 is special, tx_ring is in io space */
+                                struct tx_desc __iomem *tx;
+                                tx = (__force struct tx_desc __iomem *) &ap->tx_ring[i];
                                 writel(0, &tx->addr.addrhi);
                                 writel(0, &tx->addr.addrlo);
                                 writel(0, &tx->flagsize);
@@ -2444,7 +2445,7 @@ ace_load_tx_bd(struct ace_private *ap, struct tx_desc *desc, u64 addr,
 #endif
 
         if (ACE_IS_TIGON_I(ap)) {
-                struct tx_desc __iomem *io = (struct tx_desc __iomem *) desc;
+                struct tx_desc __iomem *io = (__force struct tx_desc __iomem *) desc;
                 writel(addr >> 32, &io->addr.addrhi);
                 writel(addr & 0xffffffff, &io->addr.addrlo);
                 writel(flagsize, &io->flagsize);
@@ -2936,7 +2937,7 @@ static void __devinit ace_clear(struct ace_regs __iomem *regs, u32 dest, int siz
  * This operation requires the NIC to be halted and is performed with
  * interrupts disabled and with the spinlock hold.
  */
-int __devinit ace_load_firmware(struct net_device *dev)
+static int __devinit ace_load_firmware(struct net_device *dev)
 {
         struct ace_private *ap = netdev_priv(dev);
         struct ace_regs __iomem *regs = ap->regs;
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index 4c728f1169c4..35b0a7dd4ef4 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -1367,7 +1367,6 @@ rrd_ok:
         if (count) {
                 u32 tpd_next_to_use;
                 u32 rfd_next_to_use;
-                u32 rrd_next_to_clean;
 
                 spin_lock(&adapter->mb_lock);
 
@@ -1512,7 +1511,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,
         unsigned int f;
         u16 tpd_next_to_use;
         u16 proto_hdr_len;
-        u16 i, m, len12;
+        u16 len12;
 
         first_buf_len -= skb->data_len;
         nr_frags = skb_shinfo(skb)->nr_frags;
@@ -1536,6 +1535,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,
                         tpd_next_to_use = 0;
 
                 if (first_buf_len > proto_hdr_len) {
+                        int i, m;
+
                         len12 = first_buf_len - proto_hdr_len;
                         m = (len12 + ATL1_MAX_TX_BUF_LEN - 1) /
                                 ATL1_MAX_TX_BUF_LEN;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index e91b7096838a..5066beb2e7bc 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -290,7 +290,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
         return err;
 }
 
-int
+static int
 find_miiphy (struct net_device *dev)
 {
         int i, phy_found = 0;
@@ -314,7 +314,7 @@ find_miiphy (struct net_device *dev)
         return 0;
 }
 
-int
+static int
 parse_eeprom (struct net_device *dev)
 {
         int i, j;
@@ -1096,7 +1096,7 @@ clear_stats (struct net_device *dev)
 }
 
 
-int
+static int
 change_mtu (struct net_device *dev, int new_mtu)
 {
         struct netdev_private *np = netdev_priv(dev);
@@ -1331,7 +1331,7 @@ rio_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)
 #define EEP_BUSY 0x8000
 /* Read the EEPROM word */
 /* We use I/O instruction to read/write eeprom to avoid fail on some machines */
-int
+static int
 read_eeprom (long ioaddr, int eep_addr)
 {
         int i = 1000;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 7bd960402687..64f35e20fd48 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1990,7 +1990,7 @@ static int e100_poll(struct napi_struct *napi, int budget)
 {
         struct nic *nic = container_of(napi, struct nic, napi);
         struct net_device *netdev = nic->netdev;
-        int work_done = 0;
+        unsigned int work_done = 0;
         int tx_cleaned;
 
         e100_rx_clean(nic, &work_done, budget);
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 015ed3a4057f..ed407c85708f 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1017,7 +1017,7 @@ static inline int hamachi_tx(struct net_device *dev)
                         break;
                 /* Free the original skb. */
                 skb = hmp->tx_skbuff[entry];
-                if (skb != 0) {
+                if (skb) {
                         pci_unmap_single(hmp->pci_dev,
                                 hmp->tx_ring[entry].addr, skb->len,
                                 PCI_DMA_TODEVICE);
@@ -1069,7 +1069,6 @@ static void hamachi_tx_timeout(struct net_device *dev)
                    " resetting...\n", dev->name, (int)readw(ioaddr + TxStatus));
 
         {
-                int i;
                 printk(KERN_DEBUG "  Rx ring %p: ", hmp->rx_ring);
                 for (i = 0; i < RX_RING_SIZE; i++)
                         printk(" %8.8x", (unsigned int)hmp->rx_ring[i].status_n_length);
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index ea38da6d31ff..322d16974000 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -1615,7 +1615,7 @@ static void do_cable_magic(struct net_device *dev)
                  * (these values all come from National)
                  */
                 if (!(data & 0x80) || ((data >= 0xd8) && (data <= 0xff))) {
-                        struct netdev_private *np = netdev_priv(dev);
+                        np = netdev_priv(dev);
 
                         /* the bug has been triggered - fix the coefficient */
                         writew(TSTDAT_FIXED, ioaddr + TSTDAT);
@@ -2502,8 +2502,8 @@ static void __set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0, sizeof(mc_filter));
                 for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
                          i++, mclist = mclist->next) {
-                        int i = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 23) & 0x1ff;
-                        mc_filter[i/8] |= (1 << (i & 0x07));
+                        int b = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 23) & 0x1ff;
+                        mc_filter[b/8] |= (1 << (b & 0x07));
                 }
                 rx_mode = RxFilterEnable | AcceptBroadcast
                         | AcceptMulticast | AcceptMyPhys;
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 248343177356..8d04654f0c59 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -750,7 +750,6 @@ bdx_vlan_rx_register(struct net_device *ndev, struct vlan_group *grp)
  */
 static int bdx_change_mtu(struct net_device *ndev, int new_mtu)
 {
-        BDX_ASSERT(ndev == 0);
         ENTER;
 
         if (new_mtu == ndev->mtu)
@@ -1002,7 +1001,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n)
 static int bdx_rx_init(struct bdx_priv *priv)
 {
         ENTER;
-        BDX_ASSERT(priv == 0);
+
         if (bdx_fifo_init(priv, &priv->rxd_fifo0.m, priv->rxd_size,
                           regRXD_CFG0_0, regRXD_CFG1_0,
                           regRXD_RPTR_0, regRXD_WPTR_0))
@@ -1747,7 +1746,6 @@ static void bdx_tx_cleanup(struct bdx_priv *priv)
                 tx_level -= db->rptr->len;      /* '-' koz len is negative */
 
                 /* now should come skb pointer - free it */
-                BDX_ASSERT(db->rptr->addr.skb == 0);
                 dev_kfree_skb_irq(db->rptr->addr.skb);
                 bdx_tx_db_inc_rptr(db);
         }