From patchwork Thu Sep 18 16:57:12 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 536 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 F0B43DE0B4 for ; Fri, 19 Sep 2008 02:57:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754741AbYIRQ5f (ORCPT ); Thu, 18 Sep 2008 12:57:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754516AbYIRQ5f (ORCPT ); Thu, 18 Sep 2008 12:57:35 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:3320 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756512AbYIRQ5d (ORCPT ); Thu, 18 Sep 2008 12:57:33 -0400 Received: from [10.11.16.99] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 18 Sep 2008 09:57:18 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 63C172B2; Thu, 18 Sep 2008 09:57:18 -0700 (PDT) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 4A7942B0; Thu, 18 Sep 2008 09:57:18 -0700 (PDT) Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with ESMTP id HDR82883; Thu, 18 Sep 2008 09:57:14 -0700 (PDT) Received: from localhost (dhcp-10-12-137-98.broadcom.com [10.12.137.98]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id E8AAD74D09; Thu, 18 Sep 2008 09:57:13 -0700 (PDT) From: "Benjamin Li" To: "Jeff Garzik" cc: benli@broadcom.com, "netdev@vger.kernel.org" Subject: [UPDATED][NET-NEXT PATCH 3/4] bnx2: Remove name field from bnx2 structure Date: Thu, 18 Sep 2008 09:57:12 -0700 Message-ID: <1221757033-4874-4-git-send-email-benli@broadcom.com> X-Mailer: git-send-email 1.6.0.1 In-Reply-To: <1221757033-4874-3-git-send-email-benli@broadcom.com> References: <20080918063933.GA8027@verge.net.au> <1221757033-4874-1-git-send-email-benli@broadcom.com> <1221757033-4874-2-git-send-email-benli@broadcom.com> <1221757033-4874-3-git-send-email-benli@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 64CC57E43D0157972905-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The name of the board is only used during the initialization of the adapter. We can save the space of a pointer by not storing this information. Signed-off-by: Benjamin Li Signed-off-by: Michael Chan diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index a78b664..8417766 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -7718,7 +7718,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) memcpy(dev->dev_addr, bp->mac_addr, 6); memcpy(dev->perm_addr, bp->mac_addr, 6); - bp->name = board_info[ent->driver_data].name; dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; if (CHIP_NUM(bp) == CHIP_NUM_5709) @@ -7745,7 +7744,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " "IRQ %d, node addr %s\n", dev->name, - bp->name, + board_info[ent->driver_data].name, ((CHIP_ID(bp) & 0xf000) >> 12) + 'A', ((CHIP_ID(bp) & 0x0ff0) >> 4), bnx2_bus_string(bp, str), diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index c3c579f..cb47c98 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6701,8 +6701,6 @@ struct bnx2 { /* End of fields used in the performance code paths. */ - char *name; - int timer_interval; int current_interval; struct timer_list timer;