Patchwork [UPDATED,NET-NEXT,3/4] bnx2: Remove name field from bnx2 structure

login
register
mail settings
Submitter Benjamin Li
Date Sept. 18, 2008, 4:57 p.m.
Message ID <1221757033-4874-4-git-send-email-benli@broadcom.com>
Download mbox | patch
Permalink /patch/536/
State Accepted
Headers show

Comments

Benjamin Li - Sept. 18, 2008, 4:57 p.m.
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 <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
David Miller - Sept. 18, 2008, 11:40 p.m.
From: "Benjamin Li" <benli@broadcom.com>
Date: Thu, 18 Sep 2008 09:57:12 -0700

> 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 <benli@broadcom.com>
> Signed-off-by: Michael Chan <mchan@broadcom.com>

Applied.

Patch

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;