Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Milo Kim and committed by
Thomas Gleixner
5fd26a0b dd85c791

+6 -14
+1 -7
drivers/irqchip/irq-atmel-aic-common.c
··· 80 80 return 0; 81 81 } 82 82 83 - int aic_common_set_priority(int priority, unsigned *val) 83 + void aic_common_set_priority(int priority, unsigned *val) 84 84 { 85 - if (priority < AT91_AIC_IRQ_MIN_PRIORITY || 86 - priority > AT91_AIC_IRQ_MAX_PRIORITY) 87 - return -EINVAL; 88 - 89 85 *val &= ~AT91_AIC_PRIOR; 90 86 *val |= priority; 91 - 92 - return 0; 93 87 } 94 88 95 89 int aic_common_irq_domain_xlate(struct irq_domain *d,
+1 -1
drivers/irqchip/irq-atmel-aic-common.h
··· 19 19 20 20 int aic_common_set_type(struct irq_data *d, unsigned type, unsigned *val); 21 21 22 - int aic_common_set_priority(int priority, unsigned *val); 22 + void aic_common_set_priority(int priority, unsigned *val); 23 23 24 24 int aic_common_irq_domain_xlate(struct irq_domain *d, 25 25 struct device_node *ctrlr,
+2 -3
drivers/irqchip/irq-atmel-aic.c
··· 196 196 197 197 irq_gc_lock(gc); 198 198 smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq)); 199 - ret = aic_common_set_priority(intspec[2], &smr); 200 - if (!ret) 201 - irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); 199 + aic_common_set_priority(intspec[2], &smr); 200 + irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); 202 201 irq_gc_unlock(gc); 203 202 204 203 return ret;
+2 -3
drivers/irqchip/irq-atmel-aic5.c
··· 272 272 irq_gc_lock(bgc); 273 273 irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR); 274 274 smr = irq_reg_readl(bgc, AT91_AIC5_SMR); 275 - ret = aic_common_set_priority(intspec[2], &smr); 276 - if (!ret) 277 - irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR); 275 + aic_common_set_priority(intspec[2], &smr); 276 + irq_reg_writel(bgc, intspec[2] | smr, AT91_AIC5_SMR); 278 277 irq_gc_unlock(bgc); 279 278 280 279 return ret;