Merge tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel...

[deliverable/linux.git] / arch / mips / cavium-octeon / octeon-irq.c

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 368eb490354ced34c29a3e0b640ac66c9762b977..5a9b87b7993e49d3fd880816ad2dad0421ac82a6 100644 (file)
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1260,7 +1260,7 @@ static int octeon_irq_gpio_map(struct irq_domain *d,
 
        line = (hw + gpiod->base_hwirq) >> 6;
        bit = (hw + gpiod->base_hwirq) & 63;
-       if (line > ARRAY_SIZE(octeon_irq_ciu_to_irq) ||
+       if (line >= ARRAY_SIZE(octeon_irq_ciu_to_irq) ||
                octeon_irq_ciu_to_irq[line][bit] != 0)
                return -EINVAL;
 
@@ -1542,10 +1542,6 @@ static int __init octeon_irq_init_ciu(
                        goto err;
        }
 
-       r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);
-       if (r)
-               goto err;
-
        r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59);
        if (r)
                goto err;
@@ -1559,10 +1555,6 @@ static int __init octeon_irq_init_ciu(
                        goto err;
        }
 
-       r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB1, 1, 17);
-       if (r)
-               goto err;
-
        /* Enable the CIU lines */
        set_c0_status(STATUSF_IP3 | STATUSF_IP2);
        if (octeon_irq_use_ip4)
@@ -2077,10 +2069,6 @@ static int __init octeon_irq_init_ciu2(
                        goto err;
        }
 
-       r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 3, 44);
-       if (r)
-               goto err;
-
        for (i = 0; i < 4; i++) {
                r = octeon_irq_force_ciu_mapping(
                        ciu_domain, i + OCTEON_IRQ_PCI_INT0, 4, i);