From 0b522497a176f222ae4cf7e6733a5357352224b2 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sun, 12 Feb 2006 22:29:36 -0800
Subject: [PATCH] [SPARC64]: Missing 'return' statement in sun4v_pci_init().
Signed-off-by: David S. Miller <davem@davemloft.net>
---
arch/sparc64/kernel/pci_sun4v.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 59e660d849ab..7055616e0839 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -916,8 +916,10 @@ void sun4v_pci_init(int node, char *model_name)
&p->pbm_A :
&p->pbm_B);
- if (pbm->devhandle == (devhandle ^ 0x40))
+ if (pbm->devhandle == (devhandle ^ 0x40)) {
pci_sun4v_pbm_init(p, node, devhandle);
+ return;
+ }
}
p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
@@ -961,7 +963,4 @@ void sun4v_pci_init(int node, char *model_name)
pci_memspace_mask = 0x7fffffffUL;
pci_sun4v_pbm_init(p, node, devhandle);
-
- prom_printf("sun4v_pci_init: Implement me.\n");
- prom_halt();
}
--
2.34.1