diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 17:03:08 +0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 17:03:08 +0400 |
commit | b775e642bf958a02210ac4d4edd1a1b7067c49fa (patch) | |
tree | a3425ead7b2738e6a05249a3c3667d1069782330 /drivers/pci | |
parent | 32147e9a8ea54f2ec9914edeede8a9d9dc02e886 (diff) | |
parent | ccdb8ed3b3c739fe99a6f2f474f7ffad3203485d (diff) | |
download | linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.tar.xz |
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 93aa29f6d39c..f2945fa73d4f 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -375,11 +375,11 @@ static void __exit cleanup_slots(void) static int __init rpaphp_init(void) { - struct device_node *dn = NULL; + struct device_node *dn; info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); - while ((dn = of_find_node_by_name(dn, "pci"))) + for_each_node_by_name(dn, "pci") rpaphp_add_slot(dn); return 0; |