6 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 19a1044a0cd9..b25428533141 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(bad_dma_address);
    be probably a smaller DMA mask, but this is bug-to-bug compatible
    to older i386. */
 struct device x86_dma_fallback_dev = {
-        .bus_id = "fallback device",
+        .init_name = "fallback device",
         .coherent_dma_mask = DMA_32BIT_MASK,
         .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,
 };
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 881fdd2b7313..5befa7e379b7 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -271,7 +271,7 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
                 dbg("%s: generationg bus event\n", __func__);
                 acpi_bus_generate_proc_event(note->device, note->event, detail);
                 acpi_bus_generate_netlink_event(note->device->pnp.device_class,
-                                                  note->device->dev.bus_id,
+                                                  dev_name(&note->device->dev),
                                                   note->event, detail);
         } else
                 note->event = event;
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
index 6441dfa969a3..de01174aff06 100644
--- a/drivers/pci/irq.c
+++ b/drivers/pci/irq.c
@@ -15,7 +15,7 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
 
         dev_printk(KERN_ERR, &pdev->dev,
                    "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
-                   parent->dev.bus_id, parent->vendor, parent->device);
+                   dev_name(&parent->dev), parent->vendor, parent->device);
         dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);
         dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
         WARN_ON(1);
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index ae5ec76dca77..2ed3f10d0860 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -375,7 +375,7 @@ static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)
          * The string should be the same as root bridge's name
          * Please look at 'pci_scan_bus_parented'
          */
-        num = sscanf(dev->bus_id, "pci%04x:%02x", &seg, &bus);
+        num = sscanf(dev_name(dev), "pci%04x:%02x", &seg, &bus);
         if (num != 2)
                 return -ENODEV;
         *handle = acpi_get_pci_rootbridge_handle(seg, bus);
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 2e091e014829..75f501ab6468 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -224,7 +224,7 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev,
         device->driver = NULL;
         device->driver_data = NULL;
         device->release = release_pcie_device;  /* callback to free pcie dev */
-        snprintf(device->bus_id, sizeof(device->bus_id), "%s:pcie%02x",
+        dev_set_name(device, "%s:pcie%02x",
                  pci_name(parent), get_descriptor_id(port_type, service_type));
         device->parent = &parent->dev;
 }
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,
          * registered later in pci_bus_add_devices()
          */
         child->dev.class = &pcibus_class;
-        sprintf(child->dev.bus_id, "%04x:%02x", pci_domain_nr(child), busnr);
+        dev_set_name(&child->dev, "%04x:%02x", pci_domain_nr(child), busnr);
 
         /*
          * Set up the primary, secondary and subordinate
@@ -1130,7 +1130,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
         memset(dev, 0, sizeof(*dev));
         dev->parent = parent;
         dev->release = pci_release_bus_bridge_dev;
-        sprintf(dev->bus_id, "pci%04x:%02x", pci_domain_nr(b), bus);
+        dev_set_name(dev, "pci%04x:%02x", pci_domain_nr(b), bus);
         error = device_register(dev);
         if (error)
                 goto dev_reg_err;
@@ -1141,7 +1141,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
 
         b->dev.class = &pcibus_class;
         b->dev.parent = b->bridge;
-        sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus);
+        dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus);
         error = device_register(&b->dev);
         if (error)
                 goto class_dev_reg_err;