8 files changed, 82 insertions, 87 deletions

diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 75a64c88cf7a..251c6ce15aea 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1448,7 +1448,7 @@ de4x5_sw_reset(struct net_device *dev)
         status = -EIO;
     }
 
-    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+    lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
     lp->tx_old = lp->tx_new;
 
     return status;
@@ -1506,7 +1506,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
             lp->stats.tx_bytes += skb->len;
             outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
 
-            lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+            lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
 
             if (TX_BUFFS_AVAIL) {
                 netif_start_queue(dev);         /* Another pkt may be queued */
@@ -1657,7 +1657,7 @@ de4x5_rx(struct net_device *dev)
             }
 
             /* Change buffer ownership for this frame, back to the adapter */
-            for (;lp->rx_old!=entry;lp->rx_old=(++lp->rx_old)%lp->rxRingSize) {
+            for (;lp->rx_old!=entry;lp->rx_old=(lp->rx_old + 1)%lp->rxRingSize) {
                 lp->rx_ring[lp->rx_old].status = cpu_to_le32(R_OWN);
                 barrier();
             }
@@ -1668,7 +1668,7 @@ de4x5_rx(struct net_device *dev)
         /*
         ** Update entry information
         */
-        lp->rx_new = (++lp->rx_new) % lp->rxRingSize;
+        lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
     }
 
     return 0;
@@ -1726,7 +1726,7 @@ de4x5_tx(struct net_device *dev)
         }
 
         /* Update all the pointers */
-        lp->tx_old = (++lp->tx_old) % lp->txRingSize;
+        lp->tx_old = (lp->tx_old + 1) % lp->txRingSize;
     }
 
     /* Any resources available? */
@@ -1801,7 +1801,7 @@ de4x5_rx_ovfc(struct net_device *dev)
 
     for (; (s32)le32_to_cpu(lp->rx_ring[lp->rx_new].status)>=0;) {
         lp->rx_ring[lp->rx_new].status = cpu_to_le32(R_OWN);
-        lp->rx_new = (++lp->rx_new % lp->rxRingSize);
+        lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
     }
 
     outl(omr, DE4X5_OMR);
@@ -1932,7 +1932,7 @@ set_multicast_list(struct net_device *dev)
             load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
                                                         SETUP_FRAME_LEN, (struct sk_buff *)1);
 
-            lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+            lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
             outl(POLL_DEMAND, DE4X5_TPD);       /* Start the TX */
             dev->trans_start = jiffies; /* prevent tx timeout */
         }
@@ -3119,7 +3119,7 @@ dc2114x_autoconf(struct net_device *dev)
           if (lp->media == _100Mb) {
               if ((slnk = test_for_100Mb(dev, 6500)) < 0) {
                   lp->media = SPD_DET;
-                  return  (slnk & ~TIMER_CB);
+                  return slnk & ~TIMER_CB;
               }
           } else {
               if (wait_for_link(dev) < 0) {
@@ -3484,7 +3484,7 @@ is_spd_100(struct net_device *dev)
         spd = ((~gep_rd(dev)) & GEP_SLNK);
     } else {
         if ((lp->ibn == 2) || !lp->asBitValid)
-            return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0);
+            return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0;
 
         spd = (lp->asBitValid & (lp->asPolarity ^ (gep_rd(dev) & lp->asBit))) |
                   (lp->linkOK & ~lp->asBitValid);
@@ -3502,15 +3502,15 @@ is_100_up(struct net_device *dev)
     if (lp->useMII) {
         /* Double read for sticky bits & temporary drops */
         mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS;
     } else if (!lp->useSROM) {                       /* de500-xa */
-        return ((~gep_rd(dev)) & GEP_SLNK);
+        return (~gep_rd(dev)) & GEP_SLNK;
     } else {
         if ((lp->ibn == 2) || !lp->asBitValid)
-            return ((lp->chipset == DC21143)?(~inl(DE4X5_SISR)&SISR_LS100):0);
+            return (lp->chipset == DC21143) ? (~inl(DE4X5_SISR)&SISR_LS100) : 0;
 
-        return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
-                (lp->linkOK & ~lp->asBitValid));
+        return (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
+                (lp->linkOK & ~lp->asBitValid);
     }
 }
 
@@ -3523,17 +3523,17 @@ is_10_up(struct net_device *dev)
     if (lp->useMII) {
         /* Double read for sticky bits & temporary drops */
         mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS;
     } else if (!lp->useSROM) {                       /* de500-xa */
-        return ((~gep_rd(dev)) & GEP_LNP);
+        return (~gep_rd(dev)) & GEP_LNP;
     } else {
         if ((lp->ibn == 2) || !lp->asBitValid)
-            return (((lp->chipset & ~0x00ff) == DC2114x) ?
+            return ((lp->chipset & ~0x00ff) == DC2114x) ?
                     (~inl(DE4X5_SISR)&SISR_LS10):
-                    0);
+                    0;
 
-        return ((lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
-                (lp->linkOK & ~lp->asBitValid));
+        return  (lp->asBitValid&(lp->asPolarity^(gep_rd(dev)&lp->asBit))) |
+                (lp->linkOK & ~lp->asBitValid);
     }
 }
 
@@ -3544,7 +3544,7 @@ is_anc_capable(struct net_device *dev)
     u_long iobase = dev->base_addr;
 
     if (lp->phy[lp->active].id && (!lp->useSROM || lp->useMII)) {
-        return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII));
+        return mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
     } else if ((lp->chipset & ~0x00ff) == DC2114x) {
         return (inl(DE4X5_SISR) & SISR_LPN) >> 12;
     } else {
@@ -3568,7 +3568,7 @@ ping_media(struct net_device *dev, int msec)
 
         lp->tmp = lp->tx_new;                /* Remember the ring position */
         load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), (struct sk_buff *)1);
-        lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+        lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
         outl(POLL_DEMAND, DE4X5_TPD);
     }
 
@@ -4930,7 +4930,7 @@ getfrom_mii(u32 command, u_long ioaddr)
     outl(command | MII_MDC, ioaddr);
     udelay(1);
 
-    return ((inl(ioaddr) >> 19) & 1);
+    return (inl(ioaddr) >> 19) & 1;
 }
 
 /*
@@ -4975,8 +4975,8 @@ mii_get_oui(u_char phyaddr, u_long ioaddr)
     a.breg[0]=a.breg[1];
     a.breg[1]=i;
 
-    return ((a.reg<<8)|ret); */                 /* SEEQ and Cypress way */
-/*    return ((r2<<6)|(u_int)(r3>>10)); */      /* NATIONAL and BROADCOM way */
+    return (a.reg<<8)|ret; */                 /* SEEQ and Cypress way */
+/*    return (r2<<6)|(u_int)(r3>>10); */      /* NATIONAL and BROADCOM way */
     return r2;                                  /* (I did it) My way */
 }
 
@@ -5144,7 +5144,7 @@ gep_rd(struct net_device *dev)
     if (lp->chipset == DC21140) {
         return inl(DE4X5_GEP);
     } else if ((lp->chipset & ~0x00ff) == DC2114x) {
-        return (inl(DE4X5_SIGR) & 0x000fffff);
+        return inl(DE4X5_SIGR) & 0x000fffff;
     }
 
     return 0;
@@ -5417,7 +5417,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         /* Set up the descriptor and give ownership to the card */
         load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
                                                        SETUP_FRAME_LEN, (struct sk_buff *)1);
-        lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+        lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
         outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */
         netif_wake_queue(dev);                      /* Unlock the TX ring */
         break;
@@ -5474,7 +5474,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         tmp.lval[6] = inl(DE4X5_STRR); j+=4;
         tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
         ioc->len = j;
-        if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
+        if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
         break;
 
 #define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 0bc4f3030a80..a9f7d5d1a269 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -599,7 +599,7 @@ static int dmfe_open(struct DEVICE *dev)
         init_timer(&db->timer);
         db->timer.expires = DMFE_TIMER_WUT + HZ * 2;
         db->timer.data = (unsigned long)dev;
-        db->timer.function = &dmfe_timer;
+        db->timer.function = dmfe_timer;
         add_timer(&db->timer);
 
         return 0;
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c
index 1faf7a4d7202..0013642903ee 100644
--- a/drivers/net/tulip/interrupt.c
+++ b/drivers/net/tulip/interrupt.c
@@ -180,21 +180,24 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                                        dev_warn(&dev->dev,
                                                                 "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
                                                                 status);
-                                               tp->stats.rx_length_errors++;
-                                       }
+                                                dev->stats.rx_length_errors++;
+                                        }
                                } else {
                                 /* There was a fatal error. */
                                        if (tulip_debug > 2)
                                                printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
                                                       dev->name, status);
-                                       tp->stats.rx_errors++; /* end of a packet.*/
-                                       if (pkt_len > 1518 ||
-                                           (status & RxDescRunt))
-                                               tp->stats.rx_length_errors++;
-
-                                       if (status & 0x0004) tp->stats.rx_frame_errors++;
-                                       if (status & 0x0002) tp->stats.rx_crc_errors++;
-                                       if (status & 0x0001) tp->stats.rx_fifo_errors++;
+                                        dev->stats.rx_errors++; /* end of a packet.*/
+                                        if (pkt_len > 1518 ||
+                                            (status & RxDescRunt))
+                                                dev->stats.rx_length_errors++;
+
+                                        if (status & 0x0004)
+                                                dev->stats.rx_frame_errors++;
+                                        if (status & 0x0002)
+                                                dev->stats.rx_crc_errors++;
+                                        if (status & 0x0001)
+                                                dev->stats.rx_fifo_errors++;
                                }
                        } else {
                                struct sk_buff *skb;
@@ -244,8 +247,8 @@ int tulip_poll(struct napi_struct *napi, int budget)
 
                                netif_receive_skb(skb);
 
-                               tp->stats.rx_packets++;
-                               tp->stats.rx_bytes += pkt_len;
+                                dev->stats.rx_packets++;
+                                dev->stats.rx_bytes += pkt_len;
                        }
 #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
                        received++;
@@ -404,20 +407,23 @@ static int tulip_rx(struct net_device *dev)
                                                 dev_warn(&dev->dev,
                                                          "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
                                                          status);
-                                        tp->stats.rx_length_errors++;
+                                        dev->stats.rx_length_errors++;
                                 }
                         } else {
                                 /* There was a fatal error. */
                                 if (tulip_debug > 2)
                                         printk(KERN_DEBUG "%s: Receive error, Rx status %08x\n",
                                                dev->name, status);
-                                tp->stats.rx_errors++; /* end of a packet.*/
+                                dev->stats.rx_errors++; /* end of a packet.*/
                                 if (pkt_len > 1518 ||
                                     (status & RxDescRunt))
-                                        tp->stats.rx_length_errors++;
-                                if (status & 0x0004) tp->stats.rx_frame_errors++;
-                                if (status & 0x0002) tp->stats.rx_crc_errors++;
-                                if (status & 0x0001) tp->stats.rx_fifo_errors++;
+                                        dev->stats.rx_length_errors++;
+                                if (status & 0x0004)
+                                        dev->stats.rx_frame_errors++;
+                                if (status & 0x0002)
+                                        dev->stats.rx_crc_errors++;
+                                if (status & 0x0001)
+                                        dev->stats.rx_fifo_errors++;
                         }
                 } else {
                         struct sk_buff *skb;
@@ -467,8 +473,8 @@ static int tulip_rx(struct net_device *dev)
 
                         netif_rx(skb);
 
-                        tp->stats.rx_packets++;
-                        tp->stats.rx_bytes += pkt_len;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += pkt_len;
                 }
                 received++;
                 entry = (++tp->cur_rx) % RX_RING_SIZE;
@@ -602,18 +608,22 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                                 printk(KERN_DEBUG "%s: Transmit error, Tx status %08x\n",
                                                        dev->name, status);
 #endif
-                                        tp->stats.tx_errors++;
-                                        if (status & 0x4104) tp->stats.tx_aborted_errors++;
-                                        if (status & 0x0C00) tp->stats.tx_carrier_errors++;
-                                        if (status & 0x0200) tp->stats.tx_window_errors++;
-                                        if (status & 0x0002) tp->stats.tx_fifo_errors++;
+                                        dev->stats.tx_errors++;
+                                        if (status & 0x4104)
+                                                dev->stats.tx_aborted_errors++;
+                                        if (status & 0x0C00)
+                                                dev->stats.tx_carrier_errors++;
+                                        if (status & 0x0200)
+                                                dev->stats.tx_window_errors++;
+                                        if (status & 0x0002)
+                                                dev->stats.tx_fifo_errors++;
                                         if ((status & 0x0080) && tp->full_duplex == 0)
-                                                tp->stats.tx_heartbeat_errors++;
+                                                dev->stats.tx_heartbeat_errors++;
                                 } else {
-                                        tp->stats.tx_bytes +=
+                                        dev->stats.tx_bytes +=
                                                 tp->tx_buffers[entry].skb->len;
-                                        tp->stats.collisions += (status >> 3) & 15;
-                                        tp->stats.tx_packets++;
+                                        dev->stats.collisions += (status >> 3) & 15;
+                                        dev->stats.tx_packets++;
                                 }
 
                                 pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
@@ -655,7 +665,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                 if (csr5 & AbnormalIntr) {      /* Abnormal error summary bit. */
                         if (csr5 == 0xffffffff)
                                 break;
-                        if (csr5 & TxJabber) tp->stats.tx_errors++;
+                        if (csr5 & TxJabber)
+                                dev->stats.tx_errors++;
                         if (csr5 & TxFIFOUnderflow) {
                                 if ((tp->csr6 & 0xC000) != 0xC000)
                                         tp->csr6 += 0x4000;     /* Bump up the Tx threshold */
@@ -672,8 +683,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
                                 }
                         }
                         if (csr5 & RxDied) {            /* Missed a Rx frame. */
-                                tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
-                                tp->stats.rx_errors++;
+                                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
+                                dev->stats.rx_errors++;
                                 tulip_start_rxtx(tp);
                         }
                         /*
@@ -789,7 +800,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)
 #endif /* CONFIG_TULIP_NAPI */
 
         if ((missed = ioread32(ioaddr + CSR8) & 0x1ffff)) {
-                tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+                dev->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
         }
 
         if (tulip_debug > 4)
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index e525875ed67d..ed66a16711dc 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -417,7 +417,6 @@ struct tulip_private {
         int revision;
         int flags;
         struct napi_struct napi;
-        struct net_device_stats stats;
         struct timer_list timer;        /* Media selection timer. */
         struct timer_list oom_timer;    /* Out of memory timer. */
         u32 mc_filter[2];
@@ -570,7 +569,7 @@ static inline void tulip_tx_timeout_complete(struct tulip_private *tp, void __io
         /* Trigger an immediate transmit demand. */
         iowrite32(0, ioaddr + CSR1);
 
-        tp->stats.tx_errors++;
+        tp->dev->stats.tx_errors++;
 }
 
 #endif /* __NET_TULIP_H__ */
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 3a8d7efa2acf..2c39f2591216 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -725,7 +725,7 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)
                 int status = le32_to_cpu(tp->tx_ring[entry].status);
 
                 if (status < 0) {
-                        tp->stats.tx_errors++;  /* It wasn't Txed */
+                        tp->dev->stats.tx_errors++;     /* It wasn't Txed */
                         tp->tx_ring[entry].status = 0;
                 }
 
@@ -781,8 +781,8 @@ static void tulip_down (struct net_device *dev)
         /* release any unconsumed transmit buffers */
         tulip_clean_tx_ring(tp);
 
-        if (ioread32 (ioaddr + CSR6) != 0xffffffff)
-                tp->stats.rx_missed_errors += ioread32 (ioaddr + CSR8) & 0xffff;
+        if (ioread32(ioaddr + CSR6) != 0xffffffff)
+                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
 
         spin_unlock_irqrestore (&tp->lock, flags);
 
@@ -864,12 +864,12 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)
 
                 spin_lock_irqsave (&tp->lock, flags);
 
-                tp->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
+                dev->stats.rx_missed_errors += ioread32(ioaddr + CSR8) & 0xffff;
 
                 spin_unlock_irqrestore(&tp->lock, flags);
         }
 
-        return &tp->stats;
+        return &dev->stats;
 }
 
 
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 96de5829b940..74217dbf0143 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -480,7 +480,7 @@ static int uli526x_open(struct net_device *dev)
         init_timer(&db->timer);
         db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
         db->timer.data = (unsigned long)dev;
-        db->timer.function = &uli526x_timer;
+        db->timer.function = uli526x_timer;
         add_timer(&db->timer);
 
         return 0;
@@ -1747,7 +1747,7 @@ static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)
                 if(cr10_value&0x10000000)
                         break;
         }
-        return (cr10_value&0x0ffff);
+        return cr10_value & 0x0ffff;
 }
 
 static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 66d41cf8da29..f0b231035dee 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -662,7 +662,7 @@ static int netdev_open(struct net_device *dev)
         init_timer(&np->timer);
         np->timer.expires = jiffies + 1*HZ;
         np->timer.data = (unsigned long)dev;
-        np->timer.function = &netdev_timer;                             /* timer handler */
+        np->timer.function = netdev_timer;                              /* timer handler */
         add_timer(&np->timer);
         return 0;
 out_err:
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index a439e93be22d..5a73752be2ca 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -29,7 +29,6 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/ethtool.h>
 #include <linux/bitops.h>
 
 #include <asm/uaccess.h>
@@ -181,19 +180,6 @@ static void print_binary(unsigned int number)
 }
 #endif
 
-static void netdev_get_drvinfo(struct net_device *dev,
-                               struct ethtool_drvinfo *info)
-{
-        struct xircom_private *private = netdev_priv(dev);
-
-        strcpy(info->driver, "xircom_cb");
-        strcpy(info->bus_info, pci_name(private->pdev));
-}
-
-static const struct ethtool_ops netdev_ethtool_ops = {
-        .get_drvinfo            = netdev_get_drvinfo,
-};
-
 static const struct net_device_ops netdev_ops = {
         .ndo_open               = xircom_open,
         .ndo_stop               = xircom_close,
@@ -279,7 +265,6 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
         setup_descriptors(private);
 
         dev->netdev_ops = &netdev_ops;
-        SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
         pci_set_drvdata(pdev, dev);
 
         if (register_netdev(dev)) {