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/jazzsonic.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/jazzsonic.c')
| -rw-r--r-- | drivers/net/jazzsonic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 334ff9e..14248cf 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -131,7 +131,8 @@ static int __init sonic_probe1(struct net_device *dev) if (sonic_debug && version_printed++ == 0) printk(version); - printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", lp->device->bus_id, dev->base_addr); + printk(KERN_INFO "%s: Sonic ethernet found at 0x%08lx, ", + dev_name(lp->device), dev->base_addr); /* * Put the sonic into software reset, then @@ -156,7 +157,8 @@ static int __init sonic_probe1(struct net_device *dev) if ((lp->descriptors = dma_alloc_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), &lp->descriptors_laddr, GFP_KERNEL)) == NULL) { - printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", lp->device->bus_id); + printk(KERN_ERR "%s: couldn't alloc DMA memory for descriptors.\n", + dev_name(lp->device)); goto out; } |