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