of/irq: Use irq_of_parse_and_map()

[cascardo/linux.git] / arch / powerpc / platforms / cell / celleb_scc_pciex.c

diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index 14be2bd..4278acf 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -486,7 +486,6 @@ static __init int celleb_setup_pciex(struct device_node *node,
                                     struct pci_controller *phb)
 {
        struct resource r;
-       struct of_irq oirq;
        int virq;
 
        /* SMMIO registers; used inside this file */
@@ -507,12 +506,11 @@ static __init int celleb_setup_pciex(struct device_node *node,
        phb->ops = &scc_pciex_pci_ops;
 
        /* internal interrupt handler */
-       if (of_irq_map_one(node, 1, &oirq)) {
+       virq = irq_of_parse_and_map(node, 1);
+       if (!virq) {
                pr_err("PCIEXC:Failed to map irq\n");
                goto error;
        }
-       virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
-                                    oirq.size);
        if (request_irq(virq, pciex_handle_internal_irq,
                        0, "pciex", (void *)phb)) {
                pr_err("PCIEXC:Failed to request irq\n");