diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:22 -0400 |
commit | c23135573f37facd18edb2e8e8512c67928c54ac (patch) | |
tree | 1fd3852a257318ba31af2f6f302d7abc8f874dd9 /drivers/net/depca.c | |
parent | 744bcb13d376b38ff1df3bbcc810493e1b999502 (diff) |
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>
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 */ |