Subject: [PATCH 4/8] Avoid use of ppc64_interrupt_controller.

From: [email-masked]
Date: Mon, 29 May 2006 16:42:05 -0400

Existence of "/platform-open-pic" is asserted by pSeries_setup_mpic if
an mpic interrupt controller exists.  Thus pSeries_mpic is non-NULL
only if the opprop value obtained here is good. Hence, no need to
check ppc64_intrerrupt_controller.

--
Signed-off-by: Michal Ostrowski <[email-masked]>

---

 arch/powerpc/kernel/rtas_pci.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

3a5eaf5436e0c413e154a933867ff5a09c019e3c
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 57b539a..e1dbd53 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -301,10 +301,8 @@ unsigned long __init find_and_init_phbs(
 	unsigned int *opprop = NULL;
 	struct device_node *root = of_find_node_by_path("/");
 
-	if (ppc64_interrupt_controller == IC_OPEN_PIC) {
-		opprop = (unsigned int *)get_property(root,
-				"platform-open-pic", NULL);
-	}
+	/* If pSeries_mpic is non-NULL, it's because opprop is non-0. */
+	opprop = (unsigned int *)get_property(root, "platform-open-pic", NULL);
 
 	root_size_cells = prom_n_size_cells(root);
 
@@ -324,7 +322,7 @@ unsigned long __init find_and_init_phbs(
 		pci_setup_phb_io(phb, index == 0);
 #ifdef CONFIG_PPC_PSERIES
 		/* XXX This code need serious fixing ... --BenH */
-		if (ppc64_interrupt_controller == IC_OPEN_PIC && pSeries_mpic) {
+		if (pSeries_mpic) {
 			int addr = root_size_cells * (index + 2) - 1;
 			mpic_assign_isu(pSeries_mpic, index, opprop[addr]);
 		}
-- 
1.1.4.g0b63-dirty