Commit ff8c3ab8 authored by Grant Likely's avatar Grant Likely
Browse files

irq_domain/powerpc: Replace custom xlate functions with library functions 



This patch converts a number of the powerpc drivers to use the common library
of irq_domain xlate functions, dropping a bunch of lines in the process.

v5: - Remove tsi108 changes from patch

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: default avatarOlof Johansson <olof@lixom.net>
parent 9f70b8eb

arch/powerpc/platforms/powermac/pic.c

+1 −12
Original line number Diff line number Diff line
@@ -288,21 +288,10 @@ static int pmac_pic_host_map(struct irq_domain *h, unsigned int virq, 
	return 0;

}



static int pmac_pic_host_xlate(struct irq_domain *h, struct device_node *ct,

			       const u32 *intspec, unsigned int intsize,

			       irq_hw_number_t *out_hwirq,

			       unsigned int *out_flags)



{

	*out_flags = IRQ_TYPE_NONE;

	*out_hwirq = *intspec;

	return 0;

}



static const struct irq_domain_ops pmac_pic_host_ops = {

	.match = pmac_pic_host_match,

	.map = pmac_pic_host_map,

	.xlate = pmac_pic_host_xlate,

	.xlate = irq_domain_xlate_onecell,

};



static void __init pmac_pic_probe_oldstyle(void)

arch/powerpc/platforms/wsp/opb_pic.c

+1 −12
Original line number Diff line number Diff line
@@ -196,20 +196,9 @@ static int opb_host_map(struct irq_domain *host, unsigned int virq, 
	return 0;

}



static int opb_host_xlate(struct irq_domain *host, struct device_node *dn,

		const u32 *intspec, unsigned int intsize,

		irq_hw_number_t *out_hwirq, unsigned int *out_type)

{

	/* Interrupt size must == 2 */

	BUG_ON(intsize != 2);

	*out_hwirq = intspec[0];

	*out_type = intspec[1];

	return 0;

}



static const struct irq_domain_ops opb_host_ops = {

	.map = opb_host_map,

	.xlate = opb_host_xlate,

	.xlate = irq_domain_xlate_twocell,

};



irqreturn_t opb_irq_handler(int irq, void *private)

arch/powerpc/sysdev/cpm2_pic.c

+1 −13
Original line number Diff line number Diff line
@@ -224,21 +224,9 @@ static int cpm2_pic_host_map(struct irq_domain *h, unsigned int virq, 
	return 0;

}



static int cpm2_pic_host_xlate(struct irq_domain *h, struct device_node *ct,

			    const u32 *intspec, unsigned int intsize,

			    irq_hw_number_t *out_hwirq, unsigned int *out_flags)

{

	*out_hwirq = intspec[0];

	if (intsize > 1)

		*out_flags = intspec[1];

	else

		*out_flags = IRQ_TYPE_NONE;

	return 0;

}



static const struct irq_domain_ops cpm2_pic_host_ops = {

	.map = cpm2_pic_host_map,

	.xlate = cpm2_pic_host_xlate,

	.xlate = irq_domain_xlate_onetwocell,

};



void cpm2_pic_init(struct device_node *node)

arch/powerpc/sysdev/ipic.c

+1 −17
Original line number Diff line number Diff line
@@ -692,26 +692,10 @@ static int ipic_host_map(struct irq_domain *h, unsigned int virq, 
	return 0;

}



static int ipic_host_xlate(struct irq_domain *h, struct device_node *ct,

			   const u32 *intspec, unsigned int intsize,

			   irq_hw_number_t *out_hwirq, unsigned int *out_flags)



{

	/* interrupt sense values coming from the device tree equal either

	 * LEVEL_LOW (low assertion) or EDGE_FALLING (high-to-low change)

	 */

	*out_hwirq = intspec[0];

	if (intsize > 1)

		*out_flags = intspec[1];

	else

		*out_flags = IRQ_TYPE_NONE;

	return 0;

}



static struct irq_domain_ops ipic_host_ops = {

	.match	= ipic_host_match,

	.map	= ipic_host_map,

	.xlate	= ipic_host_xlate,

	.xlate	= irq_domain_xlate_onetwocell,

};



struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)

arch/powerpc/sysdev/qe_lib/qe_ic.c

+1 −14
Original line number Diff line number Diff line
@@ -272,23 +272,10 @@ static int qe_ic_host_map(struct irq_domain *h, unsigned int virq, 
	return 0;

}



static int qe_ic_host_xlate(struct irq_domain *h, struct device_node *ct,

			    const u32 * intspec, unsigned int intsize,

			    irq_hw_number_t * out_hwirq,

			    unsigned int *out_flags)

{

	*out_hwirq = intspec[0];

	if (intsize > 1)

		*out_flags = intspec[1];

	else

		*out_flags = IRQ_TYPE_NONE;

	return 0;

}



static struct irq_domain_ops qe_ic_host_ops = {

	.match = qe_ic_host_match,

	.map = qe_ic_host_map,

	.xlate = qe_ic_host_xlate,

	.xlate = irq_domain_xlate_onetwocell,

};



/* Return an interrupt vector or NO_IRQ if no interrupt is pending. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE