net: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: davem@davemloft.net Cc: netdev@vger.kernel.org Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
744bcb13d3
commit
c23135573f
@@ -606,8 +606,8 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
|
||||
if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown)
|
||||
return -ENXIO;
|
||||
|
||||
printk ("%s: %s at 0x%04lx",
|
||||
device->bus_id, depca_signature[lp->adapter], ioaddr);
|
||||
printk("%s: %s at 0x%04lx",
|
||||
dev_name(device), depca_signature[lp->adapter], ioaddr);
|
||||
|
||||
switch (lp->depca_bus) {
|
||||
#ifdef CONFIG_MCA
|
||||
@@ -669,7 +669,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
|
||||
|
||||
spin_lock_init(&lp->lock);
|
||||
sprintf(lp->adapter_name, "%s (%s)",
|
||||
depca_signature[lp->adapter], device->bus_id);
|
||||
depca_signature[lp->adapter], dev_name(device));
|
||||
status = -EBUSY;
|
||||
|
||||
/* Initialisation Block */
|
||||
|
Reference in New Issue
Block a user