{"id":535,"url":"http://patchwork.ozlabs.org/api/1.0/patches/535/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1221757033-4874-5-git-send-email-benli@broadcom.com>","date":"2008-09-18T16:57:13","name":"[UPDATED,NET-NEXT,4/4] bnx2: Remove timer_interval field from the bnx2 structure","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"59b30e33baea0123ff502690b5a034fecef0c1f5","submitter":{"id":234,"url":"http://patchwork.ozlabs.org/api/1.0/people/234/?format=json","name":"Benjamin Li","email":"benli@broadcom.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1221757033-4874-5-git-send-email-benli@broadcom.com/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/535/checks/","tags":{},"headers":{"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])\n\tby ozlabs.org (Postfix) with ESMTP id 586FBDE089\n\tfor ;\n\tFri, 19 Sep 2008 02:57:44 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756508AbYIRQ5b (ORCPT );\n\tThu, 18 Sep 2008 12:57:31 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1756467AbYIRQ5b\n\t(ORCPT ); Thu, 18 Sep 2008 12:57:31 -0400","from mms1.broadcom.com ([216.31.210.17]:4709 \"EHLO\n\tmms1.broadcom.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1756442AbYIRQ51 (ORCPT );\n\tThu, 18 Sep 2008 12:57:27 -0400","from [10.11.16.99] by mms1.broadcom.com with ESMTP (Broadcom\n\tSMTP Relay (Email Firewall v6.3.2)); Thu, 18 Sep 2008 09:57:17 -0700","by mail-irva-10.broadcom.com (Postfix, from userid 47) id\n\t350672B1; Thu, 18 Sep 2008 09:57:17 -0700 (PDT)","from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by\n\tmail-irva-10.broadcom.com (Postfix) with ESMTP id 20CB62B0;\n\tThu, 18 Sep 2008 09:57:17 -0700 (PDT)","from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com\n\t[10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with\n\tESMTP id HDR82882; Thu, 18 Sep 2008 09:57:14 -0700 (PDT)","from localhost (dhcp-10-12-137-98.broadcom.com [10.12.137.98])\n\tby mail-irva-13.broadcom.com (Postfix) with ESMTP id 0E5EC74D02; Thu,\n\t18 Sep 2008 09:57:14 -0700 (PDT)"],"X-Server-Uuid":"02CED230-5797-4B57-9875-D5D2FEE4708A","From":"\"Benjamin Li\" ","To":"\"Jeff Garzik\" ","cc":"benli@broadcom.com,\n\t\"netdev@vger.kernel.org\" ","Subject":"[UPDATED][NET-NEXT PATCH 4/4] bnx2: Remove timer_interval field\n\tfrom the bnx2 structure","Date":"Thu, 18 Sep 2008 09:57:13 -0700","Message-ID":"<1221757033-4874-5-git-send-email-benli@broadcom.com>","X-Mailer":"git-send-email 1.6.0.1","In-Reply-To":"<1221757033-4874-4-git-send-email-benli@broadcom.com>","References":"<20080918063933.GA8027@verge.net.au>\n\t<1221757033-4874-1-git-send-email-benli@broadcom.com>\n\t<1221757033-4874-2-git-send-email-benli@broadcom.com>\n\t<1221757033-4874-3-git-send-email-benli@broadcom.com>\n\t<1221757033-4874-4-git-send-email-benli@broadcom.com>","MIME-Version":"1.0","X-WSS-ID":"64CC57E74E0151931913-01-01","Content-Type":"text/plain","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The timer_interval field is only assigned once, and never reassigned.\nWe can safely replace all instances of the timer_interval with a\nconstant value.\n\nSigned-off-by: Benjamin Li \nSigned-off-by: Michael Chan ","diff":"diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c\nindex 8417766..883e0a7 100644\n--- a/drivers/net/bnx2.c\n+++ b/drivers/net/bnx2.c\n@@ -5598,7 +5598,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)\n \t} else if ((bp->link_up == 0) && (bp->autoneg & AUTONEG_SPEED)) {\n \t\tu32 bmcr;\n \n-\t\tbp->current_interval = bp->timer_interval;\n+\t\tbp->current_interval = BNX2_TIMER_INTERVAL;\n \n \t\tbnx2_read_phy(bp, bp->mii_bmcr, &bmcr);\n \n@@ -5627,7 +5627,7 @@ bnx2_5706_serdes_timer(struct bnx2 *bp)\n \t\t\tbp->phy_flags &= ~BNX2_PHY_FLAG_PARALLEL_DETECT;\n \t\t}\n \t} else\n-\t\tbp->current_interval = bp->timer_interval;\n+\t\tbp->current_interval = BNX2_TIMER_INTERVAL;\n \n \tif (check_link) {\n \t\tu32 val;\n@@ -5672,11 +5672,11 @@ bnx2_5708_serdes_timer(struct bnx2 *bp)\n \t\t} else {\n \t\t\tbnx2_disable_forced_2g5(bp);\n \t\t\tbp->serdes_an_pending = 2;\n-\t\t\tbp->current_interval = bp->timer_interval;\n+\t\t\tbp->current_interval = BNX2_TIMER_INTERVAL;\n \t\t}\n \n \t} else\n-\t\tbp->current_interval = bp->timer_interval;\n+\t\tbp->current_interval = BNX2_TIMER_INTERVAL;\n \n \tspin_unlock(&bp->phy_lock);\n }\n@@ -7514,8 +7514,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)\n \n \tbp->stats_ticks = USEC_PER_SEC & BNX2_HC_STATS_TICKS_HC_STAT_TICKS;\n \n-\tbp->timer_interval = HZ;\n-\tbp->current_interval = HZ;\n+\tbp->current_interval = BNX2_TIMER_INTERVAL;\n \n \tbp->phy_addr = 1;\n \n@@ -7605,7 +7604,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)\n \tbp->req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;\n \n \tinit_timer(&bp->timer);\n-\tbp->timer.expires = RUN_AT(bp->timer_interval);\n+\tbp->timer.expires = RUN_AT(BNX2_TIMER_INTERVAL);\n \tbp->timer.data = (unsigned long) bp;\n \tbp->timer.function = bnx2_timer;\n \ndiff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h\nindex cb47c98..682b8f0 100644\n--- a/drivers/net/bnx2.h\n+++ b/drivers/net/bnx2.h\n@@ -6654,6 +6654,8 @@ struct bnx2_napi {\n \tstruct bnx2_tx_ring_info\ttx_ring;\n };\n \n+#define BNX2_TIMER_INTERVAL\t\t\tHZ\n+\n struct bnx2 {\n \t/* Fields used in the tx and intr/napi performance paths are grouped */\n \t/* together in the beginning of the structure. */\n@@ -6701,7 +6703,6 @@ struct bnx2 {\n \n \t/* End of fields used in the performance code paths. */\n \n-\tint\t\t\ttimer_interval;\n \tint\t\t\tcurrent_interval;\n \tstruct\t\t\ttimer_list timer;\n \tstruct work_struct\treset_task;\n","prefixes":["UPDATED","NET-NEXT","4/4"]}