diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-10 16:55:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-10 16:55:14 -0500 |
commit | fb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch) | |
tree | ee3d535ab38d680b424a857406789f8c28bf5266 /drivers/net/3c59x.c | |
parent | 23779897546c1effb546ff89b89803d9d955d517 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index b4168dfd6893..3893f505fb5f 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -1025,7 +1025,7 @@ static int __devinit vortex_probe1(struct device *gendev, | |||
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | if ((edev = DEVICE_EISA(gendev))) { | 1027 | if ((edev = DEVICE_EISA(gendev))) { |
1028 | print_name = edev->dev.bus_id; | 1028 | print_name = dev_name(&edev->dev); |
1029 | } | 1029 | } |
1030 | } | 1030 | } |
1031 | 1031 | ||
@@ -2883,7 +2883,7 @@ static void vortex_get_drvinfo(struct net_device *dev, | |||
2883 | strcpy(info->bus_info, pci_name(VORTEX_PCI(vp))); | 2883 | strcpy(info->bus_info, pci_name(VORTEX_PCI(vp))); |
2884 | } else { | 2884 | } else { |
2885 | if (VORTEX_EISA(vp)) | 2885 | if (VORTEX_EISA(vp)) |
2886 | sprintf(info->bus_info, vp->gendev->bus_id); | 2886 | sprintf(info->bus_info, dev_name(vp->gendev)); |
2887 | else | 2887 | else |
2888 | sprintf(info->bus_info, "EISA 0x%lx %d", | 2888 | sprintf(info->bus_info, "EISA 0x%lx %d", |
2889 | dev->base_addr, dev->irq); | 2889 | dev->base_addr, dev->irq); |