drivers: net: xgene: Remove redundant local stats

Commit 5944701df90d ("net: remove useless memset's in drivers get_stats64")
makes the pdata->stats redundant. This patch removes pdata->stats and
updates get_stats64() callback accordingly.

Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 28fdedc30b746dae3667f6f274a2c24068b21749..217cde86e1174ae596ea8c44c1346f69aaba70ef 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -25,7 +25,7 @@ struct xgene_gstrings_stats {
        int offset;
 };
 
-#define XGENE_STAT(m) { #m, offsetof(struct xgene_enet_pdata, stats.m) }
+#define XGENE_STAT(m) { #m, offsetof(struct rtnl_link_stats64, m) }
 
 static const struct xgene_gstrings_stats gstrings_stats[] = {
        XGENE_STAT(rx_packets),
@@ -156,11 +156,12 @@ static void xgene_get_ethtool_stats(struct net_device *ndev,
                                    struct ethtool_stats *dummy,
                                    u64 *data)
 {
-       void *pdata = netdev_priv(ndev);
+       struct rtnl_link_stats64 stats;
        int i;
 
+       dev_get_stats(ndev, &stats);
        for (i = 0; i < XGENE_STATS_LEN; i++)
-               *data++ = *(u64 *)(pdata + gstrings_stats[i].offset);
+               data[i] = *(u64 *)((char *)&stats + gstrings_stats[i].offset);
 }
 
 static void xgene_get_pauseparam(struct net_device *ndev,

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 9a28ac3b7687e209f986fc9c3ea0bf5cfa8dfbde..e4f2ef2d750beb04a2cbfe66bd062c313a264555 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1466,10 +1466,9 @@ err:
 
 static void xgene_enet_get_stats64(
                        struct net_device *ndev,
-                       struct rtnl_link_stats64 *storage)
+                       struct rtnl_link_stats64 *stats)
 {
        struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-       struct rtnl_link_stats64 *stats = &pdata->stats;
        struct xgene_enet_desc_ring *ring;
        int i;
 
@@ -1493,7 +1492,6 @@ static void xgene_enet_get_stats64(
                        stats->rx_dropped += ring->rx_dropped;
                }
        }
-       memcpy(storage, stats, sizeof(struct rtnl_link_stats64));
 }
 
 static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 827b33da6384912ff5ab802482ef163cc57b1790..5e6fd718b685798632aa27184e222735c442ee7a 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -219,7 +219,6 @@ struct xgene_enet_pdata {
        int phy_mode;
        enum xgene_enet_rm rm;
        struct xgene_enet_cle cle;
-       struct rtnl_link_stats64 stats;
        const struct xgene_mac_ops *mac_ops;
        spinlock_t mac_lock; /* mac lock */
        const struct xgene_port_ops *port_ops;