powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc()

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

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-3-pali@kernel.org

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 25edfe1b8ae10c0423854299b067d884e33c87b2..c6016915264c1431347cb1ae053abfd8488025cd 100644 (file)
--- 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 acc4145adcf7532a33bda326d027db5fe2b93944..c7ce8a79992da55c560edb0618a1dbc01e9e6244 100644 (file)
--- 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);