2 files changed, 13 insertions, 4 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 8335a1079b0e..9c9027b2c44e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -941,6 +941,12 @@ struct kset *bus_get_kset(struct bus_type *bus)
 }
 EXPORT_SYMBOL_GPL(bus_get_kset);
 
+struct klist *bus_get_device_klist(struct bus_type *bus)
+{
+        return &bus->klist_devices;
+}
+EXPORT_SYMBOL_GPL(bus_get_device_klist);
+
 int __init buses_init(void)
 {
         bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c5ca3134513a..5fd585293e79 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1210,16 +1210,19 @@ static void __init pci_sort_breadthfirst_klist(void)
         struct klist_node *n;
         struct device *dev;
         struct pci_dev *pdev;
+        struct klist *device_klist;
 
-        spin_lock(&pci_bus_type.klist_devices.k_lock);
-        list_for_each_safe(pos, tmp, &pci_bus_type.klist_devices.k_list) {
+        device_klist = bus_get_device_klist(&pci_bus_type);
+
+        spin_lock(&device_klist->k_lock);
+        list_for_each_safe(pos, tmp, &device_klist->k_list) {
                 n = container_of(pos, struct klist_node, n_node);
                 dev = container_of(n, struct device, knode_bus);
                 pdev = to_pci_dev(dev);
                 pci_insertion_sort_klist(pdev, &sorted_devices);
         }
-        list_splice(&sorted_devices, &pci_bus_type.klist_devices.k_list);
-        spin_unlock(&pci_bus_type.klist_devices.k_lock);
+        list_splice(&sorted_devices, &device_klist->k_list);
+        spin_unlock(&device_klist->k_lock);
 }
 
 static void __init pci_insertion_sort_devices(struct pci_dev *a, struct list_head *list)