Merge tag 'mac80211-for-davem-2017-09-07' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-block.git] / drivers / irqchip / irq-bcm7120-l2.c

diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index 64c2692070ef2a0c413e4d5760e2ee1d0f795630..983640eba418ec4e2658e10ddc93bf1f1815fc07 100644 (file)
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -250,12 +250,6 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
        if (ret < 0)
                goto out_free_l1_data;
 
-       for (idx = 0; idx < data->n_words; idx++) {
-               __raw_writel(data->irq_fwd_mask[idx],
-                            data->pair_base[idx] +
-                            data->en_offset[idx]);
-       }
-
        for (irq = 0; irq < data->num_parent_irqs; irq++) {
                ret = bcm7120_l2_intc_init_one(dn, data, irq, valid_mask);
                if (ret)
@@ -297,6 +291,10 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
                gc->reg_base = data->pair_base[idx];
                ct->regs.mask = data->en_offset[idx];
 
+               /* gc->reg_base is defined and so is gc->writel */
+               irq_reg_writel(gc, data->irq_fwd_mask[idx],
+                              data->en_offset[idx]);
+
                ct->chip.irq_mask = irq_gc_mask_clr_bit;
                ct->chip.irq_unmask = irq_gc_mask_set_bit;
                ct->chip.irq_ack = irq_gc_noop;