Re: [PATCH] powerpc/pci: Delete traverse_pci_dn()

2021-02-03 Thread Michael Ellerman
On Wed, 2 Sep 2020 13:51:21 +1000, Oliver O'Halloran wrote:
> Nothing uses it.

Applied to powerpc/next.

[1/1] powerpc/pci: Delete traverse_pci_dn()
  https://git.kernel.org/powerpc/c/7bd2b120f3fdf8e5c6d9a343517a33c2a5108794

cheers


[PATCH] powerpc/pci: Delete traverse_pci_dn()

2020-09-01 Thread Oliver O'Halloran
Nothing uses it.

Signed-off-by: Oliver O'Halloran 
---
 arch/powerpc/include/asm/ppc-pci.h |  3 ---
 arch/powerpc/kernel/pci_dn.c   | 40 --
 2 files changed, 43 deletions(-)

diff --git a/arch/powerpc/include/asm/ppc-pci.h 
b/arch/powerpc/include/asm/ppc-pci.h
index 0745422a8e57..2b9edbf6e929 100644
--- a/arch/powerpc/include/asm/ppc-pci.h
+++ b/arch/powerpc/include/asm/ppc-pci.h
@@ -28,9 +28,6 @@ struct pci_dn;
 void *pci_traverse_device_nodes(struct device_node *start,
void *(*fn)(struct device_node *, void *),
void *data);
-void *traverse_pci_dn(struct pci_dn *root,
- void *(*fn)(struct pci_dn *, void *),
- void *data);
 extern void pci_devs_phb_init_dynamic(struct pci_controller *phb);
 
 /* From rtas_pci.h */
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index e99b7c547d7e..54e240597fd9 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -443,46 +443,6 @@ void *pci_traverse_device_nodes(struct device_node *start,
 }
 EXPORT_SYMBOL_GPL(pci_traverse_device_nodes);
 
-static struct pci_dn *pci_dn_next_one(struct pci_dn *root,
- struct pci_dn *pdn)
-{
-   struct list_head *next = pdn->child_list.next;
-
-   if (next != >child_list)
-   return list_entry(next, struct pci_dn, list);
-
-   while (1) {
-   if (pdn == root)
-   return NULL;
-
-   next = pdn->list.next;
-   if (next != >parent->child_list)
-   break;
-
-   pdn = pdn->parent;
-   }
-
-   return list_entry(next, struct pci_dn, list);
-}
-
-void *traverse_pci_dn(struct pci_dn *root,
- void *(*fn)(struct pci_dn *, void *),
- void *data)
-{
-   struct pci_dn *pdn = root;
-   void *ret;
-
-   /* Only scan the child nodes */
-   for (pdn = pci_dn_next_one(root, pdn); pdn;
-pdn = pci_dn_next_one(root, pdn)) {
-   ret = fn(pdn, data);
-   if (ret)
-   return ret;
-   }
-
-   return NULL;
-}
-
 static void *add_pdn(struct device_node *dn, void *data)
 {
struct pci_controller *hose = data;
-- 
2.26.2