net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
2377989754
commit
fb28ad3590
@@ -1118,7 +1118,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
|
||||
}
|
||||
|
||||
dev->base_addr = iobase;
|
||||
printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase);
|
||||
printk ("%s: %s at 0x%04lx", dev_name(gendev), name, iobase);
|
||||
|
||||
status = get_hw_addr(dev);
|
||||
printk(", h/w address %pM\n", dev->dev_addr);
|
||||
@@ -1153,7 +1153,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
|
||||
}
|
||||
}
|
||||
lp->fdx = lp->params.fdx;
|
||||
sprintf(lp->adapter_name,"%s (%s)", name, gendev->bus_id);
|
||||
sprintf(lp->adapter_name,"%s (%s)", name, dev_name(gendev));
|
||||
|
||||
lp->dma_size = (NUM_RX_DESC + NUM_TX_DESC) * sizeof(struct de4x5_desc);
|
||||
#if defined(__alpha__) || defined(__powerpc__) || defined(CONFIG_SPARC) || defined(DE4X5_DO_MEMCPY)
|
||||
|
Reference in New Issue
Block a user