Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc95598 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

powerpc/PCI: Use list_for_each_entry() for bus traversal 



Replace list_for_each() + pci_bus_b() with list_for_each_entry().

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 59c1ad3b

arch/powerpc/kernel/pci_64.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -208,7 +208,6 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 
			  unsigned long in_devfn)

			  unsigned long in_devfn)

{

{

	struct pci_controller* hose;

	struct pci_controller* hose;

	struct list_head *ln;

	struct pci_bus *bus = NULL;

	struct pci_bus *bus = NULL;

	struct device_node *hose_node;

	struct device_node *hose_node;
@@ -230,8 +229,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 
	 * used on pre-domains setup. We return the first match

	 * used on pre-domains setup. We return the first match

	 */

	 */





	for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {

	list_for_each_entry(bus, &pci_root_buses, node) {

		bus = pci_bus_b(ln);

		if (in_bus >= bus->number && in_bus <= bus->busn_res.end)

		if (in_bus >= bus->number && in_bus <= bus->busn_res.end)

			break;

			break;

		bus = NULL;

		bus = NULL;

arch/powerpc/platforms/pseries/pci_dlpar.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -37,15 +37,15 @@ find_bus_among_children(struct pci_bus *bus, 
                        struct device_node *dn)

                        struct device_node *dn)

{

{

	struct pci_bus *child = NULL;

	struct pci_bus *child = NULL;

	struct list_head *tmp;

	struct pci_bus *tmp;

	struct device_node *busdn;

	struct device_node *busdn;





	busdn = pci_bus_to_OF_node(bus);

	busdn = pci_bus_to_OF_node(bus);

	if (busdn == dn)

	if (busdn == dn)

		return bus;

		return bus;





	list_for_each(tmp, &bus->children) {

	list_for_each_entry(tmp, &bus->children, node) {

		child = find_bus_among_children(pci_bus_b(tmp), dn);

		child = find_bus_among_children(tmp, dn);

		if (child)

		if (child)

			break;

			break;

	};

	};