irqchip/irq-mvebu-icu: Clarify the reset operation of configured interrupts

Rewrite a small section to clarify the reset operation of interrupts
already configured by ATF that we want to handle in the driver. This
will simplify the introduction of System Error Interrupts support.

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c
index a2a3acd744911014cfe46389151b68d03b54504c..0f2655d7f19e9cbecd2e86345d15a50ad7503d60 100644 (file)
--- a/drivers/irqchip/irq-mvebu-icu.c
+++ b/drivers/irqchip/irq-mvebu-icu.c
@@ -258,8 +258,12 @@ static int mvebu_icu_probe(struct platform_device *pdev)
         * avoid unpredictable SPI assignments done by firmware.
         */
        for (i = 0 ; i < ICU_MAX_IRQS ; i++) {
-               u32 icu_int = readl_relaxed(icu->base + ICU_INT_CFG(i));
-               if ((icu_int >> ICU_GROUP_SHIFT) == ICU_GRP_NSR)
+               u32 icu_int, icu_grp;
+
+               icu_int = readl_relaxed(icu->base + ICU_INT_CFG(i));
+               icu_grp = icu_int >> ICU_GROUP_SHIFT;
+
+               if (icu_grp == ICU_GRP_NSR)
                        writel_relaxed(0x0, icu->base + ICU_INT_CFG(i));
        }