From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Benjamin Li" 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> 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 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: benli@broadcom.com, "netdev@vger.kernel.org" To: "Jeff Garzik" Return-path: 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 In-Reply-To: <1221757033-4874-3-git-send-email-benli@broadcom.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/bnx2.c | 3 +-- drivers/net/bnx2.h | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) 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; -- 1.6.0.1