diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-26 21:12:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 21:12:58 -0800 |
| commit | db1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch) | |
| tree | fc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/declance.c | |
| parent | 3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (diff) | |
| download | kernel_samsung_smdk4412-db1d7bf70f42124f73675fca62fe32f3ab1111b4.zip kernel_samsung_smdk4412-db1d7bf70f42124f73675fca62fe32f3ab1111b4.tar.gz kernel_samsung_smdk4412-db1d7bf70f42124f73675fca62fe32f3ab1111b4.tar.bz2 | |
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/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 7ce3053..861c867 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; } |