[PATCH v1] powerpc/pci: convert to use for_each_pci_bridge() helper

Bjorn Helgaas bjorn.helgaas at gmail.com
Wed Nov 1 05:33:54 AEDT 2017


On Tue, Oct 31, 2017 at 10:12 AM, Andy Shevchenko
<andriy.shevchenko at linux.intel.com> wrote:
> On Fri, 2017-10-13 at 19:52 +0300, Andy Shevchenko wrote:
>> ...which makes code slightly cleaner.
>
> +Cc: Bjorn
>
> Perhaps it makes sense to pass this through PCI if no one objects?

Fine with me, but I only apply things that appear on the
linux-pci at vger.kernel.org mailing list.

>> Requires: d43f59ce6c50 ("PCI: Add for_each_pci_bridge() helper")
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
>> ---
>>  arch/powerpc/kernel/pci-hotplug.c | 7 ++-----
>>  arch/powerpc/kernel/pci_of_scan.c | 7 ++-----
>>  2 files changed, 4 insertions(+), 10 deletions(-)
>>
>> diff --git a/arch/powerpc/kernel/pci-hotplug.c
>> b/arch/powerpc/kernel/pci-hotplug.c
>> index 2d71269e7dc1..741f47295188 100644
>> --- a/arch/powerpc/kernel/pci-hotplug.c
>> +++ b/arch/powerpc/kernel/pci-hotplug.c
>> @@ -134,11 +134,8 @@ void pci_hp_add_devices(struct pci_bus *bus)
>>               pcibios_setup_bus_devices(bus);
>>               max = bus->busn_res.start;
>>               for (pass = 0; pass < 2; pass++) {
>> -                     list_for_each_entry(dev, &bus->devices,
>> bus_list) {
>> -                             if (pci_is_bridge(dev))
>> -                                     max = pci_scan_bridge(bus,
>> dev,
>> -                                                           max,
>> pass);
>> -                     }
>> +                     for_each_pci_bridge(dev, bus)
>> +                             max = pci_scan_bridge(bus, dev, max,
>> pass);
>>               }
>>       }
>>       pcibios_finish_adding_to_bus(bus);
>> diff --git a/arch/powerpc/kernel/pci_of_scan.c
>> b/arch/powerpc/kernel/pci_of_scan.c
>> index 0d790f8432d2..8bdaa2a6fa62 100644
>> --- a/arch/powerpc/kernel/pci_of_scan.c
>> +++ b/arch/powerpc/kernel/pci_of_scan.c
>> @@ -369,11 +369,8 @@ static void __of_scan_bus(struct device_node
>> *node, struct pci_bus *bus,
>>       pcibios_setup_bus_devices(bus);
>>
>>       /* Now scan child busses */
>> -     list_for_each_entry(dev, &bus->devices, bus_list) {
>> -             if (pci_is_bridge(dev)) {
>> -                     of_scan_pci_bridge(dev);
>> -             }
>> -     }
>> +     for_each_pci_bridge(dev, bus)
>> +             of_scan_pci_bridge(dev);
>>  }
>>
>>  /**
>
> --
> Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> Intel Finland Oy


More information about the Linuxppc-dev mailing list