From patchwork Tue Feb 10 18:16:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 22882 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 7423ADDDA3 for ; Wed, 11 Feb 2009 05:16:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753869AbZBJSQT (ORCPT ); Tue, 10 Feb 2009 13:16:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752903AbZBJSQS (ORCPT ); Tue, 10 Feb 2009 13:16:18 -0500 Received: from e24smtp03.br.ibm.com ([32.104.18.24]:37533 "EHLO e24smtp03.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753759AbZBJSQR (ORCPT ); Tue, 10 Feb 2009 13:16:17 -0500 Received: from d24relay01.br.ibm.com (d24relay01.br.ibm.com [9.8.31.16]) by e24smtp03.br.ibm.com (8.13.1/8.13.1) with ESMTP id n1AIEfG3023773 for ; Tue, 10 Feb 2009 16:14:41 -0200 Received: from d24av02.br.ibm.com (d24av02.br.ibm.com [9.18.232.47]) by d24relay01.br.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id n1AJFfaP3371122 for ; Tue, 10 Feb 2009 16:15:42 -0300 Received: from d24av02.br.ibm.com (loopback [127.0.0.1]) by d24av02.br.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n1AIGEhH018443 for ; Tue, 10 Feb 2009 16:16:14 -0200 Received: from [9.18.253.72] (tarouv.br.ibm.com [9.18.253.72]) by d24av02.br.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n1AIGD2W018410; Tue, 10 Feb 2009 16:16:14 -0200 Message-ID: <4991C46D.3030705@linux.vnet.ibm.com> Date: Tue, 10 Feb 2009 16:16:13 -0200 From: Breno Leitao User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: netdev , e1000-devel@lists.sourceforge.net CC: Jay Vosburgh Subject: [PATCH net-next] Removing the unused PAGE_USE_COUNT() macro on ixgbe driver Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Removing the unused PAGE_USE_COUNT() macro. Also removing the unused pages variable at ixgbe_configure_rx() function. Signed-off-by: Breno Leitão Signed-off-by: Jay Vosburgh ---- Acked-by: Peter P Waskiewicz Jr --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index a3572d1..8c32c18 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1553,9 +1553,6 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index) IXGBE_WRITE_REG(&adapter->hw, IXGBE_SRRCTL(index), srrctl); } -#define PAGE_USE_COUNT(S) (((S) >> PAGE_SHIFT) + \ - (((S) & (PAGE_SIZE - 1)) ? 1 : 0)) - /** * ixgbe_configure_rx - Configure 8259x Receive Unit after Reset * @adapter: board private structure @@ -1574,7 +1571,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 0xA54F2BEC, 0xEA49AF7C, 0xE214AD3D, 0xB855AABE, 0x6A3E67EA, 0x14364D17, 0x3BED200D}; u32 fctrl, hlreg0; - u32 pages; u32 reta = 0, mrqc; u32 rdrxctl; int rx_buf_len; @@ -1604,8 +1600,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) hlreg0 |= IXGBE_HLREG0_JUMBOEN; IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0); - pages = PAGE_USE_COUNT(adapter->netdev->mtu); - rdlen = adapter->rx_ring[0].count * sizeof(union ixgbe_adv_rx_desc); /* disable receives while setting up the descriptors */ rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);