iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

irqchip/atmel-aic: Change return type of aic_common_set_priority()

Browse Source 
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>
This commit is contained in:
Milo Kim 2016-01-13 16:19:51 +09:00 committed by Thomas Gleixner
parent dd85c79150
commit 5fd26a0bb1
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/irqchip/irq-atmel-aic-common.c
View File

@ -80,16 +80,10 @@ int aic_common_set_type(struct irq_data *d, unsigned type, unsigned *val)
return 0; return 0;
} }
int aic_common_set_priority(int priority, unsigned *val) void aic_common_set_priority(int priority, unsigned *val)
{ {
if (priority < AT91_AIC_IRQ_MIN_PRIORITY ||
priority > AT91_AIC_IRQ_MAX_PRIORITY)
return -EINVAL;
*val &= ~AT91_AIC_PRIOR; *val &= ~AT91_AIC_PRIOR;
*val |= priority; *val |= priority;
return 0;
} }
int aic_common_irq_domain_xlate(struct irq_domain *d, int aic_common_irq_domain_xlate(struct irq_domain *d,

2
drivers/irqchip/irq-atmel-aic-common.h
View File

@ -19,7 +19,7 @@
int aic_common_set_type(struct irq_data *d, unsigned type, unsigned *val); int aic_common_set_type(struct irq_data *d, unsigned type, unsigned *val);
int aic_common_set_priority(int priority, unsigned *val); void aic_common_set_priority(int priority, unsigned *val);
int aic_common_irq_domain_xlate(struct irq_domain *d, int aic_common_irq_domain_xlate(struct irq_domain *d,
struct device_node *ctrlr, struct device_node *ctrlr,

3
drivers/irqchip/irq-atmel-aic.c
View File

@ -196,8 +196,7 @@ static int aic_irq_domain_xlate(struct irq_domain *d,
irq_gc_lock(gc); irq_gc_lock(gc);
smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq)); smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq));
ret = aic_common_set_priority(intspec[2], &smr); aic_common_set_priority(intspec[2], &smr);
if (!ret)
irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq));
irq_gc_unlock(gc); irq_gc_unlock(gc);

3
drivers/irqchip/irq-atmel-aic5.c
View File

@ -272,8 +272,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d,
irq_gc_lock(bgc); irq_gc_lock(bgc);
irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR); irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR);
smr = irq_reg_readl(bgc, AT91_AIC5_SMR); smr = irq_reg_readl(bgc, AT91_AIC5_SMR);
ret = aic_common_set_priority(intspec[2], &smr); aic_common_set_priority(intspec[2], &smr);
if (!ret)
irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR); irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR);
irq_gc_unlock(bgc); irq_gc_unlock(bgc);