[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, 5 insertions, 14 deletions

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index aeaa75f549e6..487f9d2ac5b4 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -76,7 +76,6 @@ struct sb1000_private {
         unsigned char rx_session_id[NPIDS];
         unsigned char rx_frame_id[NPIDS];
         unsigned char rx_pkt_type[NPIDS];
-        struct net_device_stats stats;
 };
 
 /* prototypes for Linux interface */
@@ -85,7 +84,6 @@ static int sb1000_open(struct net_device *dev);
 static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);
 static int sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t sb1000_interrupt(int irq, void *dev_id);
-static struct net_device_stats *sb1000_stats(struct net_device *dev);
 static int sb1000_close(struct net_device *dev);
 
 
@@ -199,7 +197,6 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
         dev->do_ioctl           = sb1000_dev_ioctl;
         dev->hard_start_xmit    = sb1000_start_xmit;
         dev->stop               = sb1000_close;
-        dev->get_stats          = sb1000_stats;
 
         /* hardware address is 0:0:serial_number */
         dev->dev_addr[2]        = serial_number >> 24 & 0xff;
@@ -739,7 +736,7 @@ sb1000_rx(struct net_device *dev)
         unsigned int skbsize;
         struct sk_buff *skb;
         struct sb1000_private *lp = netdev_priv(dev);
-        struct net_device_stats *stats = &lp->stats;
+        struct net_device_stats *stats = &dev->stats;
 
         /* SB1000 frame constants */
         const int FrameSize = FRAMESIZE;
@@ -1002,11 +999,11 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
         switch (cmd) {
         case SIOCGCMSTATS:              /* get statistics */
-                stats[0] = lp->stats.rx_bytes;
+                stats[0] = dev->stats.rx_bytes;
                 stats[1] = lp->rx_frames;
-                stats[2] = lp->stats.rx_packets;
-                stats[3] = lp->stats.rx_errors;
-                stats[4] = lp->stats.rx_dropped;
+                stats[2] = dev->stats.rx_packets;
+                stats[3] = dev->stats.rx_errors;
+                stats[4] = dev->stats.rx_dropped;
                 if(copy_to_user(ifr->ifr_data, stats, sizeof(stats)))
                         return -EFAULT;
                 status = 0;
@@ -1132,12 +1129,6 @@ static irqreturn_t sb1000_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct net_device_stats *sb1000_stats(struct net_device *dev)
-{
-        struct sb1000_private *lp = netdev_priv(dev);
-        return &lp->stats;
-}
-
 static int sb1000_close(struct net_device *dev)
 {
         int i;