ARM: orion: convert the irq_reg_{readl,writel} calls to the new API

[ Upstream commit 2f90bce7ff1f760986d55d9cb3a834e8638b1295 ]

The commit "genirq: Generic chip: Change irq_reg_{readl,writel}
arguments" modified the API. In the same tome the
arch/arm/plat-orion/gpio.c file received a fix with the use of the old
API: "ARM: orion: Fix for certain sequence of request_irq can cause
irq storm". This commit fixes the use of the API.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Olof Johansson <olof@lixom.net>
Link: https://lkml.kernel.org/r/1416928752-24529-1-git-send-email-gregory.clement@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e048f6198d68d69449c642c71e45db6022b4e4e9..14f6e647c7394c83e9d708117839f5bc617ed8cc 100644 (file)
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -505,9 +505,9 @@ static void orion_gpio_unmask_irq(struct irq_data *d)
        u32 mask = d->mask;
 
        irq_gc_lock(gc);
-       reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);
+       reg_val = irq_reg_readl(gc, ct->regs.mask);
        reg_val |= mask;
-       irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);
+       irq_reg_writel(gc, reg_val, ct->regs.mask);
        irq_gc_unlock(gc);
 }
 
@@ -519,9 +519,9 @@ static void orion_gpio_mask_irq(struct irq_data *d)
        u32 reg_val;
 
        irq_gc_lock(gc);
-       reg_val = irq_reg_readl(gc->reg_base + ct->regs.mask);
+       reg_val = irq_reg_readl(gc, ct->regs.mask);
        reg_val &= ~mask;
-       irq_reg_writel(reg_val, gc->reg_base + ct->regs.mask);
+       irq_reg_writel(gc, reg_val, ct->regs.mask);
        irq_gc_unlock(gc);
 }