Commit 560698e9 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas

pcmcia: Use list_for_each_entry() for bus traversal

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

[bhelgaas: fix "silbling" typo]
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3bc95598
...@@ -1076,7 +1076,7 @@ static void yenta_config_init(struct yenta_socket *socket) ...@@ -1076,7 +1076,7 @@ static void yenta_config_init(struct yenta_socket *socket)
*/ */
static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
{ {
struct list_head *tmp; struct pci_bus *sibling;
unsigned char upper_limit; unsigned char upper_limit;
/* /*
* We only check and fix the parent bridge: All systems which need * We only check and fix the parent bridge: All systems which need
...@@ -1095,18 +1095,18 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge) ...@@ -1095,18 +1095,18 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
/* stay within the limits of the bus range of the parent: */ /* stay within the limits of the bus range of the parent: */
upper_limit = bridge_to_fix->parent->busn_res.end; upper_limit = bridge_to_fix->parent->busn_res.end;
/* check the bus ranges of all silbling bridges to prevent overlap */ /* check the bus ranges of all sibling bridges to prevent overlap */
list_for_each(tmp, &bridge_to_fix->parent->children) { list_for_each_entry(sibling, &bridge_to_fix->parent->children,
struct pci_bus *silbling = pci_bus_b(tmp); node) {
/* /*
* If the silbling has a higher secondary bus number * If the sibling has a higher secondary bus number
* and it's secondary is equal or smaller than our * and it's secondary is equal or smaller than our
* current upper limit, set the new upper limit to * current upper limit, set the new upper limit to
* the bus number below the silbling's range: * the bus number below the sibling's range:
*/ */
if (silbling->busn_res.start > bridge_to_fix->busn_res.end if (sibling->busn_res.start > bridge_to_fix->busn_res.end
&& silbling->busn_res.start <= upper_limit) && sibling->busn_res.start <= upper_limit)
upper_limit = silbling->busn_res.start - 1; upper_limit = sibling->busn_res.start - 1;
} }
/* Show that the wanted subordinate number is not possible: */ /* Show that the wanted subordinate number is not possible: */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment