diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-27 00:12:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-27 00:12:58 -0500 |
commit | db1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch) | |
tree | fc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/depca.c | |
parent | 3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/depca.c')
-rw-r--r-- | drivers/net/depca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index e4cef491dc73..55625dbbae5a 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -606,8 +606,8 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
606 | if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown) | 606 | if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown) |
607 | return -ENXIO; | 607 | return -ENXIO; |
608 | 608 | ||
609 | printk ("%s: %s at 0x%04lx", | 609 | printk("%s: %s at 0x%04lx", |
610 | device->bus_id, depca_signature[lp->adapter], ioaddr); | 610 | dev_name(device), depca_signature[lp->adapter], ioaddr); |
611 | 611 | ||
612 | switch (lp->depca_bus) { | 612 | switch (lp->depca_bus) { |
613 | #ifdef CONFIG_MCA | 613 | #ifdef CONFIG_MCA |
@@ -669,7 +669,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
669 | 669 | ||
670 | spin_lock_init(&lp->lock); | 670 | spin_lock_init(&lp->lock); |
671 | sprintf(lp->adapter_name, "%s (%s)", | 671 | sprintf(lp->adapter_name, "%s (%s)", |
672 | depca_signature[lp->adapter], device->bus_id); | 672 | depca_signature[lp->adapter], dev_name(device)); |
673 | status = -EBUSY; | 673 | status = -EBUSY; |
674 | 674 | ||
675 | /* Initialisation Block */ | 675 | /* Initialisation Block */ |