summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip/irq-atmel-aic5.c
diff options
context:
space:
mode:
authorMilo Kim2016-01-13 08:19:51 +0100
committerThomas Gleixner2016-02-08 15:03:42 +0100
commit5fd26a0bb1e479014adf024df779172d33defdd5 (patch)
tree48ba03099f0c7bfb5ee109b65e37e9d54035fd1d /drivers/irqchip/irq-atmel-aic5.c
parentirqchip/atmel-aic: Handle aic_common_irq_fixup in aic_common_of_init (diff)
downloadkernel-qcow2-linux-5fd26a0bb1e479014adf024df779172d33defdd5.tar.gz
kernel-qcow2-linux-5fd26a0bb1e479014adf024df779172d33defdd5.tar.xz
kernel-qcow2-linux-5fd26a0bb1e479014adf024df779172d33defdd5.zip
irqchip/atmel-aic: Change return type of aic_common_set_priority()
Priority validation is not necessary because aic_common_irq_domain_xlate() already handles it. With this removal, return type can be changed to void. Signed-off-by: Milo Kim <milo.kim@ti.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Ludovic Desroches <ludovic.desroches@atmel.com> Cc: Nicholas Ferre <nicolas.ferre@atmel.com> Link: http://lkml.kernel.org/r/1452669592-3401-3-git-send-email-milo.kim@ti.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip/irq-atmel-aic5.c')
-rw-r--r--drivers/irqchip/irq-atmel-aic5.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index a7e8fc81c80c..f36f426edc62 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -272,9 +272,8 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
irq_gc_lock(bgc);
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
- ret = aic_common_set_priority(intspec[2], &smr);
- if (!ret)
- irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
+ aic_common_set_priority(intspec[2], &smr);
+ irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
irq_gc_unlock(bgc);
return ret;