Explorar o código

bnx2: Remove name field from bnx2 structure

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>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Benjamin Li %!s(int64=16) %!d(string=hai) anos
pai
achega
fbbf68b7f8
Modificáronse 2 ficheiros con 1 adicións e 4 borrados
  1. 1 2
      drivers/net/bnx2.c
  2. 0 2
      drivers/net/bnx2.h

+ 1 - 2
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->dev_addr, bp->mac_addr, 6);
 	memcpy(dev->perm_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;
 	dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 	if (CHIP_NUM(bp) == CHIP_NUM_5709)
 	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, "
 	printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
 		"IRQ %d, node addr %s\n",
 		"IRQ %d, node addr %s\n",
 		dev->name,
 		dev->name,
-		bp->name,
+		board_info[ent->driver_data].name,
 		((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
 		((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
 		((CHIP_ID(bp) & 0x0ff0) >> 4),
 		((CHIP_ID(bp) & 0x0ff0) >> 4),
 		bnx2_bus_string(bp, str),
 		bnx2_bus_string(bp, str),

+ 0 - 2
drivers/net/bnx2.h

@@ -6701,8 +6701,6 @@ struct bnx2 {
 
 
 	/* End of fields used in the performance code paths. */
 	/* End of fields used in the performance code paths. */
 
 
-	char			*name;
-
 	int			timer_interval;
 	int			timer_interval;
 	int			current_interval;
 	int			current_interval;
 	struct			timer_list timer;
 	struct			timer_list timer;