summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorMilo Kim <milo.kim@ti.com>2016-01-13 16:19:52 +0900
committerThomas Gleixner <tglx@linutronix.de>2016-02-08 15:03:42 +0100
commit4b5ce20b5429eb08ae0776962a4aff7f00017800 (patch)
tree53cc9c32235d83405622f0ccef7aa5263626fb9f /drivers/irqchip
parent5fd26a0bb1e479014adf024df779172d33defdd5 (diff)
downloadlinux-4b5ce20b5429eb08ae0776962a4aff7f00017800.tar.gz
linux-4b5ce20b5429eb08ae0776962a4aff7f00017800.tar.bz2
linux-4b5ce20b5429eb08ae0776962a4aff7f00017800.zip
irqchip/atmel-aic: Remove duplicate bit operation
AIC5 priority value is updated twice - in aic_common_set_priority() and when updating AT91_AIC5_SMR. Variable, 'smr' has updated priority value (intspec[2]) in the first step, so no need to update it again in the second step. 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-4-git-send-email-milo.kim@ti.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-atmel-aic5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index f36f426edc62..4f0d068e1abe 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -273,7 +273,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
aic_common_set_priority(intspec[2], &smr);
- irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
+ irq_reg_writel(bgc, smr, AT91_AIC5_SMR);
irq_gc_unlock(bgc);
return ret;