summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-sunxi-nmi.c
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2014-11-06 22:44:17 -0800
committerJason Cooper <jason@lakedaemon.net>2014-11-09 04:01:22 +0000
commit332fd7c4fef5f3b166e93decb07fd69eb24f7998 (patch)
tree73f4056f73629eecffaa5d3140fbb2e88c609ff5 /drivers/irqchip/irq-sunxi-nmi.c
parent1dacf194b1468546a5715db58cbb65d50b598482 (diff)
downloadlinux-stable-332fd7c4fef5f3b166e93decb07fd69eb24f7998.tar.gz
linux-stable-332fd7c4fef5f3b166e93decb07fd69eb24f7998.tar.bz2
linux-stable-332fd7c4fef5f3b166e93decb07fd69eb24f7998.zip
genirq: Generic chip: Change irq_reg_{readl,writel} arguments
Pass in the irq_chip_generic struct so we can use different readl/writel settings for each irqchip driver, when appropriate. Compute (gc->reg_base + reg_offset) in the helper function because this is pretty much what all callers want to do anyway. Compile-tested using the following configurations: at91_dt_defconfig (CONFIG_ATMEL_AIC_IRQ=y) sama5_defconfig (CONFIG_ATMEL_AIC5_IRQ=y) sunxi_defconfig (CONFIG_ARCH_SUNXI=y) tb10x (ARC) is untested. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://lkml.kernel.org/r/1415342669-30640-3-git-send-email-cernekee@gmail.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip/irq-sunxi-nmi.c')
-rw-r--r--drivers/irqchip/irq-sunxi-nmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index 12f547a44ae4..4a9ce5b50c5b 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -50,12 +50,12 @@ static struct sunxi_sc_nmi_reg_offs sun6i_reg_offs = {
static inline void sunxi_sc_nmi_write(struct irq_chip_generic *gc, u32 off,
u32 val)
{
- irq_reg_writel(val, gc->reg_base + off);
+ irq_reg_writel(gc, val, off);
}
static inline u32 sunxi_sc_nmi_read(struct irq_chip_generic *gc, u32 off)
{
- return irq_reg_readl(gc->reg_base + off);
+ return irq_reg_readl(gc, off);
}
static void sunxi_sc_nmi_handle_irq(unsigned int irq, struct irq_desc *desc)