Commit 273e6672 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Li Yang
Browse files

soc: fsl: qe: use qe_ic_cascade_{low, high}_mpic also on 83xx 



The *_ipic and *_mpic handlers are almost identical - the only
difference is that the latter end with an unconditional
chip->irq_eoi() call. Since IPIC does not have ->irq_eoi, we can
reduce some code duplication by calling irq_eoi conditionally.

This is similar to what is already done in mpc8xxx_gpio_irq_cascade().

This leaves the functions slightly misnamed, but that will be fixed in
a subsequent patch.

Reviewed-by: default avatarTimur Tabi <timur@kernel.org>
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent ea275d1f

arch/powerpc/platforms/83xx/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void __init mpc83xx_qe_init_IRQ(void) 
		if (!np)

			return;

	}

	qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);

	qe_ic_init(np, 0, qe_ic_cascade_low_mpic, qe_ic_cascade_high_mpic);

	of_node_put(np);

}

include/soc/fsl/qe/qe_ic.h

+4 −20
Original line number Diff line number Diff line
@@ -74,24 +74,6 @@ void qe_ic_set_highest_priority(unsigned int virq, int high); 
int qe_ic_set_priority(unsigned int virq, unsigned int priority);

int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high);



static inline void qe_ic_cascade_low_ipic(struct irq_desc *desc)

{

	struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);

	unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);



	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);

}



static inline void qe_ic_cascade_high_ipic(struct irq_desc *desc)

{

	struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);

	unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);



	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);

}



static inline void qe_ic_cascade_low_mpic(struct irq_desc *desc)

{

	struct qe_ic *qe_ic = irq_desc_get_handler_data(desc);
@@ -101,6 +83,7 @@ static inline void qe_ic_cascade_low_mpic(struct irq_desc *desc) 
	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);



	if (chip->irq_eoi)

		chip->irq_eoi(&desc->irq_data);

}
@@ -113,6 +96,7 @@ static inline void qe_ic_cascade_high_mpic(struct irq_desc *desc) 
	if (cascade_irq != NO_IRQ)

		generic_handle_irq(cascade_irq);



	if (chip->irq_eoi)

		chip->irq_eoi(&desc->irq_data);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE