Merge tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[cascardo/linux.git] / arch / arm / plat-orion / gpio.c

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e53fc8d..5168a52 100644 (file)
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -506,9 +506,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);
 }
 
@@ -520,9 +520,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);
 }