[tip:irq/core] irqchip/atmel-aic: Remove duplicate bit operation

tip-bot for Milo Kim
2016-02-08T14:07:41Z

Commit-ID: 4b5ce20b5429eb08ae0776962a4aff7f00017800
Gitweb: http://git.kernel.org/tip/4b5ce20b5429eb08ae0776962a4aff7f00017800
Author: Milo Kim <milo.kim@ti.com>
AuthorDate: Wed, 13 Jan 2016 16:19:52 +0900
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 8 Feb 2016 15:03:42 +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.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>
---
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;