[PATCH v5 4/8] powerpc/pci: Reduce code duplication in pci_add_device_node_info

[Sergey Miroshnichenko]

It is possible now to allocate and fill a new pdn with add_one_dev_pci_data

Signed-off-by: Sergey Miroshnichenko <s.miroshniche...@yadro.com>
---
 arch/powerpc/kernel/pci_dn.c | 38 +++++++++++++++---------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index b594b055b2cf..7f12882d8882 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -159,22 +159,20 @@ static struct pci_dn *pci_alloc_pdn(struct pci_dn *parent,
 {
        struct pci_dn *pdn;
 
-       /* Except PHB, we always have the parent */
-       if (!parent)
-               return NULL;
-
        pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);
        if (!pdn)
                return NULL;
 
-       pdn->phb = parent->phb;
        pdn->parent = parent;
        pdn->busno = busno;
        pdn->devfn = devfn;
        pdn->pe_number = IODA_INVALID_PE;
        INIT_LIST_HEAD(&pdn->child_list);
        INIT_LIST_HEAD(&pdn->list);
-       list_add_tail(&pdn->list, &parent->child_list);
+       if (parent) {
+               pdn->phb = parent->phb;
+               list_add_tail(&pdn->list, &parent->child_list);
+       }
 
        return pdn;
 }
@@ -341,25 +339,29 @@ struct pci_dn *pci_add_device_node_info(struct 
pci_controller *hose,
        const __be32 *regs;
        struct device_node *parent;
        struct pci_dn *pdn;
+       int busno = 0, devfn = 0;
 #ifdef CONFIG_EEH
        struct eeh_dev *edev;
 #endif
 
-       pdn = kzalloc(sizeof(*pdn), GFP_KERNEL);
-       if (pdn == NULL)
-               return NULL;
-       dn->data = pdn;
-       pdn->phb = hose;
-       pdn->pe_number = IODA_INVALID_PE;
        regs = of_get_property(dn, "reg", NULL);
        if (regs) {
                u32 addr = of_read_number(regs, 1);
 
                /* First register entry is addr (00BBSS00)  */
-               pdn->busno = (addr >> 16) & 0xff;
-               pdn->devfn = (addr >> 8) & 0xff;
+               busno = (addr >> 16) & 0xff;
+               devfn = (addr >> 8) & 0xff;
        }
 
+       parent = of_get_parent(dn);
+       pdn = pci_alloc_pdn(parent ? PCI_DN(parent) : NULL,
+                           busno, devfn);
+       if (!pdn)
+               return NULL;
+
+       dn->data = pdn;
+       pdn->phb = hose;
+
        /* vendor/device IDs and class code */
        regs = of_get_property(dn, "vendor-id", NULL);
        pdn->vendor_id = regs ? of_read_number(regs, 1) : 0;
@@ -380,14 +382,6 @@ struct pci_dn *pci_add_device_node_info(struct 
pci_controller *hose,
        }
 #endif
 
-       /* Attach to parent node */
-       INIT_LIST_HEAD(&pdn->child_list);
-       INIT_LIST_HEAD(&pdn->list);
-       parent = of_get_parent(dn);
-       pdn->parent = parent ? PCI_DN(parent) : NULL;
-       if (pdn->parent)
-               list_add_tail(&pdn->list, &pdn->parent->child_list);
-
        return pdn;
 }
 EXPORT_SYMBOL_GPL(pci_add_device_node_info);
-- 
2.20.1