[NET] drivers/net: statistics cleanup #1 -- save memory and shrink code

We now have struct net_device_stats embedded in struct net_device,
and the default ->get_stats() hook does the obvious thing for us.

Run through drivers/net/* and remove the driver-local storage of
statistics, and driver-local ->get_stats() hook where applicable.

This was just the low-hanging fruit in drivers/net; plenty more drivers
remain to be updated.

[ Resolved conflicts with napi_struct changes and fix sunqe build
  regression... -DaveM ]

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 19 deletions

diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index a92c207b8839..4b93902906ba 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -216,7 +216,6 @@ MODULE_PARM_DESC(de620_debug, "DE-620 debug level (0-2)");
 /* Put in the device structure. */
 static int      de620_open(struct net_device *);
 static int      de620_close(struct net_device *);
-static struct   net_device_stats *get_stats(struct net_device *);
 static void     de620_set_multicast_list(struct net_device *);
 static int      de620_start_xmit(struct sk_buff *, struct net_device *);
 
@@ -480,16 +479,6 @@ static int de620_close(struct net_device *dev)
 
 /*********************************************
  *
- * Return current statistics
- *
- */
-static struct net_device_stats *get_stats(struct net_device *dev)
-{
-        return (struct net_device_stats *)(dev->priv);
-}
-
-/*********************************************
- *
  * Set or clear the multicast filter for this adaptor.
  * (no real multicast implemented for the DE-620, but she can be promiscuous...)
  *
@@ -579,7 +568,7 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if(!(using_txbuf == (TXBF0 | TXBF1)))
                 netif_wake_queue(dev);
 
-        ((struct net_device_stats *)(dev->priv))->tx_packets++;
+        dev->stats.tx_packets++;
         spin_unlock_irqrestore(&de620_lock, flags);
         dev_kfree_skb (skb);
         return 0;
@@ -660,7 +649,7 @@ static int de620_rx_intr(struct net_device *dev)
                 /* You win some, you lose some. And sometimes plenty... */
                 adapter_init(dev);
                 netif_wake_queue(dev);
-                ((struct net_device_stats *)(dev->priv))->rx_over_errors++;
+                dev->stats.rx_over_errors++;
                 return 0;
         }
 
@@ -680,7 +669,7 @@ static int de620_rx_intr(struct net_device *dev)
                 next_rx_page = header_buf.Rx_NextPage; /* at least a try... */
                 de620_send_command(dev, W_DUMMY);
                 de620_set_register(dev, W_NPRF, next_rx_page);
-                ((struct net_device_stats *)(dev->priv))->rx_over_errors++;
+                dev->stats.rx_over_errors++;
                 return 0;
         }
         next_rx_page = pagelink;
@@ -693,7 +682,7 @@ static int de620_rx_intr(struct net_device *dev)
                 skb = dev_alloc_skb(size+2);
                 if (skb == NULL) { /* Yeah, but no place to put it... */
                         printk(KERN_WARNING "%s: Couldn't allocate a sk_buff of size %d.\n", dev->name, size);
-                        ((struct net_device_stats *)(dev->priv))->rx_dropped++;
+                        dev->stats.rx_dropped++;
                 }
                 else { /* Yep! Go get it! */
                         skb_reserve(skb,2);     /* Align */
@@ -706,8 +695,8 @@ static int de620_rx_intr(struct net_device *dev)
                         netif_rx(skb); /* deliver it "upstairs" */
                         dev->last_rx = jiffies;
                         /* count all receives */
-                        ((struct net_device_stats *)(dev->priv))->rx_packets++;
-                        ((struct net_device_stats *)(dev->priv))->rx_bytes += size;
+                        dev->stats.rx_packets++;
+                        dev->stats.rx_bytes += size;
                 }
         }
 
@@ -819,7 +808,7 @@ struct net_device * __init de620_probe(int unit)
         int err = -ENOMEM;
         int i;
 
-        dev = alloc_etherdev(sizeof(struct net_device_stats));
+        dev = alloc_etherdev(0);
         if (!dev)
                 goto out;
 
@@ -879,7 +868,6 @@ struct net_device * __init de620_probe(int unit)
         else
                 printk(" UTP)\n");
 
-        dev->get_stats          = get_stats;
         dev->open               = de620_open;
         dev->stop               = de620_close;
         dev->hard_start_xmit    = de620_start_xmit;