[PATCH] powerpc: merge code values for identifying platforms

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / pseries / xics.c

diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 405c4f3229b363cf7cc619d9eba96aa4e465725f..72ac18067ecef58c4af36c49502e387be119d3fd 100644 (file)
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -545,7 +545,9 @@ nextnode:
                of_node_put(np);
        }
 
-       if (systemcfg->platform == PLATFORM_PSERIES) {
+       if (platform_is_lpar())
+               ops = &pSeriesLP_ops;
+       else {
 #ifdef CONFIG_SMP
                for_each_cpu(i) {
                        int hard_id;
@@ -561,8 +563,6 @@ nextnode:
 #else
                xics_per_cpu[0] = ioremap(intr_base, intr_size);
 #endif /* CONFIG_SMP */
-       } else if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
-               ops = &pSeriesLP_ops;
        }
 
        xics_8259_pic.enable = i8259_pic.enable;