]> git.karo-electronics.de Git - linux-beck.git/commitdiff
r8152: remove rtl8152_get_stats
authorhayeswang <hayeswang@realtek.com>
Thu, 6 Mar 2014 07:07:18 +0000 (15:07 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Mar 2014 18:15:12 +0000 (13:15 -0500)
The rtl8152_get_stats() returns the point address of the struct
net_device_stats. This could be got from struct net_device directly.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 151398b7a5bee053f4379dc7d13a950e5ca576f4..b8eee365e15dcc733db445cff3cc49566d9347bc 100644 (file)
@@ -960,11 +960,6 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
        return 0;
 }
 
-static struct net_device_stats *rtl8152_get_stats(struct net_device *dev)
-{
-       return &dev->stats;
-}
-
 static void read_bulk_callback(struct urb *urb)
 {
        struct net_device *netdev;
@@ -1052,7 +1047,7 @@ static void write_bulk_callback(struct urb *urb)
                return;
 
        netdev = tp->netdev;
-       stats = rtl8152_get_stats(netdev);
+       stats = &netdev->stats;
        if (status) {
                if (net_ratelimit())
                        netdev_warn(netdev, "Tx status %d\n", status);
@@ -1442,7 +1437,7 @@ static void rx_bottom(struct r8152 *tp)
 
                while (urb->actual_length > len_used) {
                        struct net_device *netdev = tp->netdev;
-                       struct net_device_stats *stats;
+                       struct net_device_stats *stats = &netdev->stats;
                        unsigned int pkt_len;
                        struct sk_buff *skb;
 
@@ -1454,8 +1449,6 @@ static void rx_bottom(struct r8152 *tp)
                        if (urb->actual_length < len_used)
                                break;
 
-                       stats = rtl8152_get_stats(netdev);
-
                        pkt_len -= CRC_SIZE;
                        rx_data += sizeof(struct rx_desc);
 
@@ -1504,16 +1497,14 @@ static void tx_bottom(struct r8152 *tp)
 
                res = r8152_tx_agg_fill(tp, agg);
                if (res) {
-                       struct net_device_stats *stats;
-                       struct net_device *netdev;
-                       unsigned long flags;
-
-                       netdev = tp->netdev;
-                       stats = rtl8152_get_stats(netdev);
+                       struct net_device *netdev = tp->netdev;
 
                        if (res == -ENODEV) {
                                netif_device_detach(netdev);
                        } else {
+                               struct net_device_stats *stats = &netdev->stats;
+                               unsigned long flags;
+
                                netif_warn(tp, tx_err, netdev,
                                           "failed tx_urb %d\n", res);
                                stats->tx_dropped += agg->skb_num;