powerpc/powernv: Free PHB instance upon error

We don't free PHB instance (struct pnv_phb) on error to creating
the associated PCI controler (struct pci_controller). The patch
fixes that. Also, the output messages have been cleaned for a bit
so that they looks unified for IODA_1/2 cases.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index d8140b125e62508720388d683a5028199d62ff28..9cccdc7007d4aa6f70b3126bb3fe707b5868eadc 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1113,7 +1113,7 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
        void *aux;
        long rc;
 
-       pr_info(" Initializing IODA%d OPAL PHB %s\n", ioda_type, np->full_name);
+       pr_info("Initializing IODA%d OPAL PHB %s\n", ioda_type, np->full_name);
 
        prop64 = of_get_property(np, "ibm,opal-phbid", NULL);
        if (!prop64) {
@@ -1124,13 +1124,18 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
        pr_debug("  PHB-ID  : 0x%016llx\n", phb_id);
 
        phb = alloc_bootmem(sizeof(struct pnv_phb));
-       if (phb) {
-               memset(phb, 0, sizeof(struct pnv_phb));
-               phb->hose = hose = pcibios_alloc_controller(np);
+       if (!phb) {
+               pr_err("  Out of memory !\n");
+               return;
        }
-       if (!phb || !phb->hose) {
-               pr_err("PCI: Failed to allocate PCI controller for %s\n",
+
+       /* Allocate PCI controller */
+       memset(phb, 0, sizeof(struct pnv_phb));
+       phb->hose = hose = pcibios_alloc_controller(np);
+       if (!phb->hose) {
+               pr_err("  Can't allocate PCI controller for %s\n",
                       np->full_name);
+               free_bootmem((unsigned long)phb, sizeof(struct pnv_phb));
                return;
        }