Commit d4995244 authored by Kay Sievers's avatar Kay Sievers Committed by Kyle McMartin

parisc: dino: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 8b6649c5
...@@ -479,7 +479,7 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr) ...@@ -479,7 +479,7 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr)
res = &dino_dev->hba.lmmio_space; res = &dino_dev->hba.lmmio_space;
res->flags = IORESOURCE_MEM; res->flags = IORESOURCE_MEM;
size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)", size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)",
bus->bridge->bus_id); dev_name(bus->bridge));
res->name = kmalloc(size+1, GFP_KERNEL); res->name = kmalloc(size+1, GFP_KERNEL);
if(res->name) if(res->name)
strcpy((char *)res->name, name); strcpy((char *)res->name, name);
...@@ -493,7 +493,7 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr) ...@@ -493,7 +493,7 @@ dino_card_setup(struct pci_bus *bus, void __iomem *base_addr)
struct list_head *ln, *tmp_ln; struct list_head *ln, *tmp_ln;
printk(KERN_ERR "Dino: cannot attach bus %s\n", printk(KERN_ERR "Dino: cannot attach bus %s\n",
bus->bridge->bus_id); dev_name(bus->bridge));
/* kill the bus, we can't do anything with it */ /* kill the bus, we can't do anything with it */
list_for_each_safe(ln, tmp_ln, &bus->devices) { list_for_each_safe(ln, tmp_ln, &bus->devices) {
struct pci_dev *dev = pci_dev_b(ln); struct pci_dev *dev = pci_dev_b(ln);
...@@ -611,12 +611,12 @@ dino_fixup_bus(struct pci_bus *bus) ...@@ -611,12 +611,12 @@ dino_fixup_bus(struct pci_bus *bus)
} }
DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n", DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n",
bus->self->dev.bus_id, i, dev_name(&bus->self->dev), i,
bus->self->resource[i].start, bus->self->resource[i].start,
bus->self->resource[i].end); bus->self->resource[i].end);
pci_assign_resource(bus->self, i); pci_assign_resource(bus->self, i);
DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n", DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n",
bus->self->dev.bus_id, i, dev_name(&bus->self->dev), i,
bus->self->resource[i].start, bus->self->resource[i].start,
bus->self->resource[i].end); bus->self->resource[i].end);
} }
...@@ -1026,7 +1026,8 @@ static int __init dino_probe(struct parisc_device *dev) ...@@ -1026,7 +1026,8 @@ static int __init dino_probe(struct parisc_device *dev)
dino_current_bus = bus->subordinate + 1; dino_current_bus = bus->subordinate + 1;
pci_bus_assign_resources(bus); pci_bus_assign_resources(bus);
} else { } else {
printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", dev->dev.bus_id, dino_current_bus); printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n",
dev_name(&dev->dev), dino_current_bus);
/* increment the bus number in case of duplicates */ /* increment the bus number in case of duplicates */
dino_current_bus++; dino_current_bus++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment