powerpc/mpic: Remove MPIC_BROKEN_FRR_NIRQS and duplicate irq_count

The mpic->irq_count variable is only used as a software error-checking
limit to determine whether or not an IRQ number is valid.  In board code
which does not manually specify an IRQ count to mpic_alloc(), i.e. 0, it
is automatically detected from the number of ISUs and the ISU size.

In practice, all hardware ends up with irq_count == num_sources, so all
of the runtime checks on mpic->irq_count should just check the value of
mpic->num_sources instead.

When platform hardware does not correctly report the number of IRQs,
which only happens on the MPC85xx/MPC86xx, the MPIC_BROKEN_FRR_NIRQS
flag is used to override the detected value of num_sources with the
manual irq_count parameter.  Since there's no need to manually specify
the number of IRQs except in this case, the extra flag can be eliminated
and the test changed to "irq_count != 0".

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index eefbb91e1d6..528b9a09e14 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -72,13 +72,13 @@ void __init mpc85xx_ds_pic_init(void)
 
         if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) {
                 mpic = mpic_alloc(NULL, 0,
-                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
+                        MPIC_BIG_ENDIAN |
                         MPIC_SINGLE_DEST_CPU,
                         0, 256, " OpenPIC  ");
         } else {
                 mpic = mpic_alloc(NULL, 0,
                           MPIC_WANTS_RESET |
-                          MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
+                          MPIC_BIG_ENDIAN |
                           MPIC_SINGLE_DEST_CPU,
                         0, 256, " OpenPIC  ");
         }