Commit-ID: 8c7baa8c3d57004ed3e850fb7a106acf38810e3c Gitweb: http://git.kernel.org/tip/8c7baa8c3d57004ed3e850fb7a106acf38810e3c Author: Milo Kim <milo....@ti.com> AuthorDate: Wed, 13 Jan 2016 16:19:52 +0900 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Mon, 8 Feb 2016 11:45:21 +0100
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....@ti.com> Acked-by: Boris Brezillon <boris.brezil...@free-electrons.com> Cc: Jason Cooper <ja...@lakedaemon.net> Cc: Marc Zyngier <marc.zyng...@arm.com> Cc: Ludovic Desroches <ludovic.desroc...@atmel.com> Cc: Nicholas Ferre <nicolas.fe...@atmel.com> Link: http://lkml.kernel.org/r/1452669592-3401-4-git-send-email-milo....@ti.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/irqchip/irq-atmel-aic5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index f36f426..4f0d068 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;
