From patchwork Wed Apr 26 23:38:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 755689 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wCxLP6V4Gz9s82 for ; Thu, 27 Apr 2017 09:36:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b="YlPXkEfW"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032782AbdDZXgo (ORCPT ); Wed, 26 Apr 2017 19:36:44 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:35100 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032761AbdDZXgg (ORCPT ); Wed, 26 Apr 2017 19:36:36 -0400 Received: by mail-pf0-f177.google.com with SMTP id v14so8272744pfd.2 for ; Wed, 26 Apr 2017 16:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eOnyekJFuA4aO6O8CWWmIcd1QZLSoXOLUjObHYfiCYQ=; b=YlPXkEfWPjxruZsRGw0VQk2Y7HbjmJdIRXC4RU8tuoGQOOLqLdgdIRrkHj/ABGwX6r XjK9faSy7doS0R3EuTe69yFT5ScIIeJFjr67a2+f10Dh9cwJkzjReuX+Xdlfoh/q76Vj FOo7w7fvEcP+0ByUYTAu+Vs+flbXsitiMnHn8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eOnyekJFuA4aO6O8CWWmIcd1QZLSoXOLUjObHYfiCYQ=; b=MB/FlGbsV4GPlf8nGtSGzMyFcQvShVs5ta0/Zm2HzohQCo0g4JOXfUHfpeVrOwz4Pf UHLcBhsaCC86oHHS+pSciF6/i4AqpHEPzqBgaLkIC9rOSBHE3K1634ShQgKuTy3kvOdE TJ1sC110Jqyr7CdIfQ7tCxDolV6TzU8RkeZVdq/B/wwcd6pzFVY/C/86b9Q8bhl5lO7o cgzbHFueJettIK4nYee5oie9nwmK4rMGxFo/W2ibiXgTWXUOOTQiHZfnqSzfjn7MzDA/ 9gjbTK3tb3vTvyllbUhzquHnSB8oCC4CmtS2P8zESVwXmpLwmI3x/uDTFgM0mF10YofE zRoQ== X-Gm-Message-State: AN3rC/7CwRydm60wsfPSf17YMxgDGlWaxl6iMhDffkibOwH/ae0dIMRe o6YUuQNuPT0Xd8rMyKs= X-Received: by 10.98.61.91 with SMTP id k88mr2570015pfa.62.1493249795546; Wed, 26 Apr 2017 16:36:35 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id i30sm626700pgn.39.2017.04.26.16.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 16:36:35 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@apm.com, Quan Nguyen , Iyappan Subramanian Subject: [PATCH net-next 2/9] drivers: net: xgene: Remove redundant local stats Date: Wed, 26 Apr 2017 16:38:48 -0700 Message-Id: <1493249935-30759-3-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com> References: <1493249935-30759-1-git-send-email-isubramanian@apm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quan Nguyen 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 Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c | 7 ++++--- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +--- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c index 28fdedc..217cde8 100644 --- 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 9a28ac3..e4f2ef2 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1466,10 +1466,9 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) 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 827b33d..5e6fd71 100644 --- 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;