diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 16:38:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 16:38:22 -0700 |
| commit | c23135573f37facd18edb2e8e8512c67928c54ac (patch) | |
| tree | 1fd3852a257318ba31af2f6f302d7abc8f874dd9 /drivers/net/declance.c | |
| parent | 744bcb13d376b38ff1df3bbcc810493e1b999502 (diff) | |
| download | linux-c23135573f37facd18edb2e8e8512c67928c54ac.tar.gz linux-c23135573f37facd18edb2e8e8512c67928c54ac.tar.bz2 linux-c23135573f37facd18edb2e8e8512c67928c54ac.zip | |
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/declance.c')
| -rw-r--r-- | drivers/net/declance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 7ce3053530f9..861c867fca87 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -1027,7 +1027,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type) printk(version); if (bdev) - snprintf(name, sizeof(name), "%s", bdev->bus_id); + snprintf(name, sizeof(name), "%s", dev_name(bdev)); else { i = 0; dev = root_lance_dev; @@ -1105,10 +1105,10 @@ static int __init dec_lance_probe(struct device *bdev, const int type) start = to_tc_dev(bdev)->resource.start; len = to_tc_dev(bdev)->resource.end - start + 1; - if (!request_mem_region(start, len, bdev->bus_id)) { + if (!request_mem_region(start, len, dev_name(bdev))) { printk(KERN_ERR "%s: Unable to reserve MMIO resource\n", - bdev->bus_id); + dev_name(bdev)); ret = -EBUSY; goto err_out_dev; } |