sparc64: Simplify error handling in PCI controller probing.

Based upon suggestions from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 11 deletions

diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c
index 477928aad538..4fb1ef92cb16 100644
--- a/arch/sparc64/kernel/pci_fire.c
+++ b/arch/sparc64/kernel/pci_fire.c
@@ -515,13 +515,13 @@ static int __devinit fire_probe(struct of_device *op,
         p = kzalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
         if (!p) {
                 printk(KERN_ERR PFX "Cannot allocate controller info.\n");
-                goto out_free;
+                goto out_err;
         }
 
         iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);
         if (!iommu) {
                 printk(KERN_ERR PFX "Cannot allocate PBM A iommu.\n");
-                goto out_free;
+                goto out_free_controller;
         }
 
         p->pbm_A.iommu = iommu;
@@ -529,21 +529,20 @@ static int __devinit fire_probe(struct of_device *op,
         iommu = kzalloc(sizeof(struct iommu), GFP_ATOMIC);
         if (!iommu) {
                 printk(KERN_ERR PFX "Cannot allocate PBM A iommu.\n");
-                goto out_free;
+                goto out_free_iommu_A;
         }
 
         p->pbm_B.iommu = iommu;
 
         return pci_fire_pbm_init(p, dp, portid);
 
-out_free:
-        if (p) {
-                if (p->pbm_A.iommu)
-                        kfree(p->pbm_A.iommu);
-                if (p->pbm_B.iommu)
-                        kfree(p->pbm_B.iommu);
-                kfree(p);
-        }
+out_free_iommu_A:
+        kfree(p->pbm_A.iommu);
+                        
+out_free_controller:
+        kfree(p);
+
+out_err:
         return err;
 }