From patchwork Wed Jun 28 15:13:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thor Thayer X-Patchwork-Id: 781742 X-Patchwork-Delegate: linville@tuxdriver.com 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 3wyR7m6W84z9ryb for ; Thu, 29 Jun 2017 01:11:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751647AbdF1PK5 (ORCPT ); Wed, 28 Jun 2017 11:10:57 -0400 Received: from mga09.intel.com ([134.134.136.24]:30327 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553AbdF1PKv (ORCPT ); Wed, 28 Jun 2017 11:10:51 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jun 2017 08:10:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,276,1496127600"; d="scan'208";a="1188036336" Received: from tthayer-hp-z620-workstation.an.intel.com ([10.122.105.144]) by fmsmga002.fm.intel.com with ESMTP; 28 Jun 2017 08:10:40 -0700 From: thor.thayer@linux.intel.com To: linville@tuxdriver.com, peppe.cavallaro@st.com Cc: netdev@vger.kernel.org, thor.thayer@linux.intel.com Subject: [PATCHv2 2/3] ethtool: stmmac: Add macros for number of registers Date: Wed, 28 Jun 2017 10:13:41 -0500 Message-Id: <1498662822-12173-3-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498662822-12173-1-git-send-email-thor.thayer@linux.intel.com> References: <1498662822-12173-1-git-send-email-thor.thayer@linux.intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thor Thayer This patch adds macros for the number of registers to loop through to make the code easier to read. Signed-off-by: Thor Thayer --- v2 New commit. Add macros for number of registers. --- stmmac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stmmac.c b/stmmac.c index e1bb291..ab83779 100644 --- a/stmmac.c +++ b/stmmac.c @@ -14,6 +14,10 @@ #include #include "internal.h" +#define MAC100_DMA_REG_NUM 9 +#define GMAC_REG_NUM 55 +#define GMAC_DMA_REG_NUM 22 + /* The DMA Registers start at offset 0x1000 in the DW IP */ #define DMA_REG_OFFSET (0x1000 / 4) @@ -40,7 +44,7 @@ int st_mac100_dump_regs(struct ethtool_drvinfo *info, fprintf(stdout, "\n"); fprintf(stdout, "DMA Registers\n"); stmmac_reg = (unsigned int *)regs->data + DMA_REG_OFFSET; - for (i = 0; i < 9; i++) + for (i = 0; i < MAC100_DMA_REG_NUM; i++) fprintf(stdout, "CSR%d 0x%08X\n", i, *stmmac_reg++); fprintf(stdout, "DMA cur tx buf addr 0x%08X\n", *stmmac_reg++); @@ -58,13 +62,13 @@ int st_gmac_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) fprintf(stdout, "ST GMAC Registers\n"); fprintf(stdout, "GMAC Registers\n"); - for (i = 0; i < 55; i++) + for (i = 0; i < GMAC_REG_NUM; i++) fprintf(stdout, "Reg%d 0x%08X\n", i, *stmmac_reg++); fprintf(stdout, "\n"); fprintf(stdout, "DMA Registers\n"); stmmac_reg = (unsigned int *)regs->data + DMA_REG_OFFSET; - for (i = 0; i < 22; i++) + for (i = 0; i < GMAC_DMA_REG_NUM; i++) fprintf(stdout, "Reg%d 0x%08X\n", i, *stmmac_reg++); return 0;