[PATCH v4 05/17] powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc()

[Christophe Leroy]

Reduce number of lines in the call to mpic_alloc().

Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
 arch/powerpc/platforms/85xx/mpc85xx_ds.c  | 18 ++++++------------
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 16 +++++-----------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c 
b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index f385cd288a76..1e6e89136948 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -50,23 +50,17 @@ static void mpc85xx_8259_cascade(struct irq_desc *desc)
 void __init mpc85xx_ds_pic_init(void)
 {
        struct mpic *mpic;
+       int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
 #ifdef CONFIG_PPC_I8259
        struct device_node *np;
        struct device_node *cascade_node = NULL;
        int cascade_irq;
 #endif
-       if (of_machine_is_compatible("fsl,MPC8572DS-CAMP")) {
-               mpic = mpic_alloc(NULL, 0,
-                       MPIC_NO_RESET |
-                       MPIC_BIG_ENDIAN |
-                       MPIC_SINGLE_DEST_CPU,
-                       0, 256, " OpenPIC  ");
-       } else {
-               mpic = mpic_alloc(NULL, 0,
-                         MPIC_BIG_ENDIAN |
-                         MPIC_SINGLE_DEST_CPU,
-                       0, 256, " OpenPIC  ");
-       }
+
+       if (of_machine_is_compatible("fsl,MPC8572DS-CAMP"))
+               flags |= MPIC_NO_RESET;
+
+       mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");
 
        BUG_ON(mpic == NULL);
        mpic_init(mpic);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c 
b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index b5e9a6374edb..110365d7b997 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -32,18 +32,12 @@
 void __init mpc85xx_rdb_pic_init(void)
 {
        struct mpic *mpic;
+       int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
 
-       if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP")) {
-               mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET |
-                       MPIC_BIG_ENDIAN |
-                       MPIC_SINGLE_DEST_CPU,
-                       0, 256, " OpenPIC  ");
-       } else {
-               mpic = mpic_alloc(NULL, 0,
-                 MPIC_BIG_ENDIAN |
-                 MPIC_SINGLE_DEST_CPU,
-                 0, 256, " OpenPIC  ");
-       }
+       if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP"))
+               flags |= MPIC_NO_RESET;
+
+       mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");
 
        BUG_ON(mpic == NULL);
        mpic_init(mpic);
-- 
2.39.1