aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 5b3f5937ecf5..eb2b985beb48 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -412,7 +412,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
412 * registered later in pci_bus_add_devices() 412 * registered later in pci_bus_add_devices()
413 */ 413 */
414 child->dev.class = &pcibus_class; 414 child->dev.class = &pcibus_class;
415 sprintf(child->dev.bus_id, "%04x:%02x", pci_domain_nr(child), busnr); 415 dev_set_name(&child->dev, "%04x:%02x", pci_domain_nr(child), busnr);
416 416
417 /* 417 /*
418 * Set up the primary, secondary and subordinate 418 * Set up the primary, secondary and subordinate
@@ -1130,7 +1130,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
1130 memset(dev, 0, sizeof(*dev)); 1130 memset(dev, 0, sizeof(*dev));
1131 dev->parent = parent; 1131 dev->parent = parent;
1132 dev->release = pci_release_bus_bridge_dev; 1132 dev->release = pci_release_bus_bridge_dev;
1133 sprintf(dev->bus_id, "pci%04x:%02x", pci_domain_nr(b), bus); 1133 dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus);
1134 error = device_register(dev); 1134 error = device_register(dev);
1135 if (error) 1135 if (error)
1136 goto dev_reg_err; 1136 goto dev_reg_err;
@@ -1141,7 +1141,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
1141 1141
1142 b->dev.class = &pcibus_class; 1142 b->dev.class = &pcibus_class;
1143 b->dev.parent = b->bridge; 1143 b->dev.parent = b->bridge;
1144 sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus); 1144 dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus);
1145 error = device_register(&b->dev); 1145 error = device_register(&b->dev);
1146 if (error) 1146 if (error)
1147 goto class_dev_reg_err; 1147 goto class_dev_reg_err;