From patchwork Sat Dec 7 08:10:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srikanth Thokala X-Patchwork-Id: 298632 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 ACC0D2C008A for ; Sat, 7 Dec 2013 19:11:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064Ab3LGILI (ORCPT ); Sat, 7 Dec 2013 03:11:08 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:41914 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751990Ab3LGILH (ORCPT ); Sat, 7 Dec 2013 03:11:07 -0500 Received: by mail-pd0-f172.google.com with SMTP id g10so2268777pdj.17 for ; Sat, 07 Dec 2013 00:11:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=fGCWUPbWCYkzXTHmkI2DEf7pOckCcXnSsDcLDIwrCoI=; b=JWDK4cviXGSsYzxIR6BlaHwZiAAxVez04eeBQkNxzlRW6ssD0VzUqTF9UNmSm8jPPy jh7PKS37xIViauJQwEA+b57ipb+HpZZiZpvv9+bF5ojXf7PeWHZFxWm98blz8TiK2d1D Behni08/BpspSPB4uNXMJREIZAbCG73ZCbICweYmFwqFTAvAg17eJkzM3/yzZxlO4OHC Uz8GUtogI4jXWoy3VPDf350Rny3AyyVcBIb3xaL4TgVK2jbRsl9sN3KFA296rMlw8hCp e1reEsLF9jgAiRGSmMj+5BfUxaGEYUxSrwoP3RDiZXK5iiN3NSsTc1463ZDoNHcGcFNw jFNQ== X-Received: by 10.68.89.162 with SMTP id bp2mr8741298pbb.151.1386403867275; Sat, 07 Dec 2013 00:11:07 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id xe9sm3774700pab.0.2013.12.07.00.11.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 07 Dec 2013 00:11:06 -0800 (PST) From: Srikanth Thokala To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: davem@davemloft.net, michal.simek@xilinx.com, Srikanth Thokala Subject: [PATCH v2 1/2] net: emaclite: Remove unnecessary code that enables/disables interrupts on PONG buffers Date: Sat, 7 Dec 2013 13:40:48 +0530 Message-Id: <1386403849-3153-1-git-send-email-sthokal@xilinx.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There are no specific interrupts for the PONG buffer on both transmit and receive side, same interrupt is valid for both buffers. So, this patch removes this code. Signed-off-by: Srikanth Thokala Reviewed-by: Michal Simek --- Changes in v2: rebased on v3.13.0-rc3. drivers/net/ethernet/xilinx/xilinx_emaclite.c | 38 ------------------------- 1 file changed, 38 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 74234a5..b2850fd 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -163,26 +163,9 @@ static void xemaclite_enable_interrupts(struct net_local *drvdata) __raw_writel(reg_data | XEL_TSR_XMIT_IE_MASK, drvdata->base_addr + XEL_TSR_OFFSET); - /* Enable the Tx interrupts for the second Buffer if - * configured in HW */ - if (drvdata->tx_ping_pong != 0) { - reg_data = __raw_readl(drvdata->base_addr + - XEL_BUFFER_OFFSET + XEL_TSR_OFFSET); - __raw_writel(reg_data | XEL_TSR_XMIT_IE_MASK, - drvdata->base_addr + XEL_BUFFER_OFFSET + - XEL_TSR_OFFSET); - } - /* Enable the Rx interrupts for the first buffer */ __raw_writel(XEL_RSR_RECV_IE_MASK, drvdata->base_addr + XEL_RSR_OFFSET); - /* Enable the Rx interrupts for the second Buffer if - * configured in HW */ - if (drvdata->rx_ping_pong != 0) { - __raw_writel(XEL_RSR_RECV_IE_MASK, drvdata->base_addr + - XEL_BUFFER_OFFSET + XEL_RSR_OFFSET); - } - /* Enable the Global Interrupt Enable */ __raw_writel(XEL_GIER_GIE_MASK, drvdata->base_addr + XEL_GIER_OFFSET); } @@ -206,31 +189,10 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata) __raw_writel(reg_data & (~XEL_TSR_XMIT_IE_MASK), drvdata->base_addr + XEL_TSR_OFFSET); - /* Disable the Tx interrupts for the second Buffer - * if configured in HW */ - if (drvdata->tx_ping_pong != 0) { - reg_data = __raw_readl(drvdata->base_addr + XEL_BUFFER_OFFSET + - XEL_TSR_OFFSET); - __raw_writel(reg_data & (~XEL_TSR_XMIT_IE_MASK), - drvdata->base_addr + XEL_BUFFER_OFFSET + - XEL_TSR_OFFSET); - } - /* Disable the Rx interrupts for the first buffer */ reg_data = __raw_readl(drvdata->base_addr + XEL_RSR_OFFSET); __raw_writel(reg_data & (~XEL_RSR_RECV_IE_MASK), drvdata->base_addr + XEL_RSR_OFFSET); - - /* Disable the Rx interrupts for the second buffer - * if configured in HW */ - if (drvdata->rx_ping_pong != 0) { - - reg_data = __raw_readl(drvdata->base_addr + XEL_BUFFER_OFFSET + - XEL_RSR_OFFSET); - __raw_writel(reg_data & (~XEL_RSR_RECV_IE_MASK), - drvdata->base_addr + XEL_BUFFER_OFFSET + - XEL_RSR_OFFSET); - } } /**