Commit 309ed3a7 authored by Sam Bobroff's avatar Sam Bobroff Committed by Michael Ellerman

powerpc/eeh: Introduce eeh_for_each_pe()

Add a for_each-style macro for iterating through PEs without the
boilerplate required by a traversal function. eeh_pe_next() is now
exported, as it is now used directly in place.
Signed-off-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 30424e38
...@@ -106,6 +106,9 @@ struct eeh_pe { ...@@ -106,6 +106,9 @@ struct eeh_pe {
#define eeh_pe_for_each_dev(pe, edev, tmp) \ #define eeh_pe_for_each_dev(pe, edev, tmp) \
list_for_each_entry_safe(edev, tmp, &pe->edevs, list) list_for_each_entry_safe(edev, tmp, &pe->edevs, list)
#define eeh_for_each_pe(root, pe) \
for (pe = root; pe; pe = eeh_pe_next(pe, root))
static inline bool eeh_pe_passed(struct eeh_pe *pe) static inline bool eeh_pe_passed(struct eeh_pe *pe)
{ {
return pe ? !!atomic_read(&pe->pass_dev_cnt) : false; return pe ? !!atomic_read(&pe->pass_dev_cnt) : false;
...@@ -267,6 +270,7 @@ typedef void *(*eeh_pe_traverse_func)(struct eeh_pe *pe, void *flag); ...@@ -267,6 +270,7 @@ typedef void *(*eeh_pe_traverse_func)(struct eeh_pe *pe, void *flag);
void eeh_set_pe_aux_size(int size); void eeh_set_pe_aux_size(int size);
int eeh_phb_pe_create(struct pci_controller *phb); int eeh_phb_pe_create(struct pci_controller *phb);
struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb); struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb);
struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *root);
struct eeh_pe *eeh_pe_get(struct pci_controller *phb, struct eeh_pe *eeh_pe_get(struct pci_controller *phb,
int pe_no, int config_addr); int pe_no, int config_addr);
int eeh_add_to_parent_pe(struct eeh_dev *edev); int eeh_add_to_parent_pe(struct eeh_dev *edev);
......
...@@ -142,8 +142,7 @@ struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb) ...@@ -142,8 +142,7 @@ struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb)
* The function is used to retrieve the next PE in the * The function is used to retrieve the next PE in the
* hierarchy PE tree. * hierarchy PE tree.
*/ */
static struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *root)
struct eeh_pe *root)
{ {
struct list_head *next = pe->child_list.next; struct list_head *next = pe->child_list.next;
...@@ -178,7 +177,7 @@ void *eeh_pe_traverse(struct eeh_pe *root, ...@@ -178,7 +177,7 @@ void *eeh_pe_traverse(struct eeh_pe *root,
struct eeh_pe *pe; struct eeh_pe *pe;
void *ret; void *ret;
for (pe = root; pe; pe = eeh_pe_next(pe, root)) { eeh_for_each_pe(root, pe) {
ret = fn(pe, flag); ret = fn(pe, flag);
if (ret) return ret; if (ret) return ret;
} }
...@@ -209,7 +208,7 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root, ...@@ -209,7 +208,7 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root,
} }
/* Traverse root PE */ /* Traverse root PE */
for (pe = root; pe; pe = eeh_pe_next(pe, root)) { eeh_for_each_pe(root, pe) {
eeh_pe_for_each_dev(pe, edev, tmp) { eeh_pe_for_each_dev(pe, edev, tmp) {
ret = fn(edev, flag); ret = fn(edev, flag);
if (ret) if (ret)
......
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