Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fd26a0b authored by Milo Kim's avatar Milo Kim Committed by Thomas Gleixner
Browse files

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: default avatarMilo Kim <milo.kim@ti.com>
Acked-by: default avatarBoris 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent dd85c791

drivers/irqchip/irq-atmel-aic-common.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -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,

drivers/irqchip/irq-atmel-aic-common.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

drivers/irqchip/irq-atmel-aic.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -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);

drivers/irqchip/irq-atmel-aic5.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -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);