of/irq: Replace of_irq with of_phandle_args
struct of_irq and struct of_phandle_args are exactly the same structure. This patch makes the kernel use of_phandle_args everywhere. This in itself isn't a big deal, but it makes some follow-on patches simpler. Signed-off-by: Grant Likely <grant.likely@linaro.org> Acked-by: Michal Simek <monstr@monstr.eu> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
@@ -228,7 +228,7 @@ int pcibios_add_platform_entries(struct pci_dev *pdev)
|
||||
*/
|
||||
static int pci_read_irq_line(struct pci_dev *pci_dev)
|
||||
{
|
||||
struct of_irq oirq;
|
||||
struct of_phandle_args oirq;
|
||||
unsigned int virq;
|
||||
|
||||
pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
|
||||
@@ -263,11 +263,10 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
|
||||
irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
|
||||
} else {
|
||||
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
|
||||
oirq.size, oirq.specifier[0], oirq.specifier[1],
|
||||
of_node_full_name(oirq.controller));
|
||||
oirq.args_count, oirq.args[0], oirq.args[1],
|
||||
of_node_full_name(oirq.np));
|
||||
|
||||
virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
|
||||
oirq.size);
|
||||
virq = irq_create_of_mapping(oirq.np, oirq.args, oirq.args_count);
|
||||
}
|
||||
if(virq == NO_IRQ) {
|
||||
pr_debug(" Failed to map !\n");
|
||||
|
Reference in New Issue
Block a user