Merge branch '4.7-fixes' into mips-for-linux-next

[deliverable/linux.git] / arch / mips / lantiq / irq.c

diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index 7cce277b017f7cec5953f6209425dcfc16ad2180..8ac0e5994ed2926548e3da44b158b7a8aff4aa12 100644 (file)
--- a/arch/mips/lantiq/irq.c
+++ b/arch/mips/lantiq/irq.c
@@ -125,7 +125,7 @@ static int ltq_eiu_settype(struct irq_data *d, unsigned int type)
 {
        int i;
 
-       for (i = 0; i < MAX_EIU; i++) {
+       for (i = 0; i < exin_avail; i++) {
                if (d->hwirq == ltq_eiu_irq[i]) {
                        int val = 0;
                        int edge = 0;
@@ -173,7 +173,7 @@ static unsigned int ltq_startup_eiu_irq(struct irq_data *d)
        int i;
 
        ltq_enable_irq(d);
-       for (i = 0; i < MAX_EIU; i++) {
+       for (i = 0; i < exin_avail; i++) {
                if (d->hwirq == ltq_eiu_irq[i]) {
                        /* by default we are low level triggered */
                        ltq_eiu_settype(d, IRQF_TRIGGER_LOW);
@@ -195,7 +195,7 @@ static void ltq_shutdown_eiu_irq(struct irq_data *d)
        int i;
 
        ltq_disable_irq(d);
-       for (i = 0; i < MAX_EIU; i++) {
+       for (i = 0; i < exin_avail; i++) {
                if (d->hwirq == ltq_eiu_irq[i]) {
                        /* disable */
                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~BIT(i),
@@ -206,7 +206,7 @@ static void ltq_shutdown_eiu_irq(struct irq_data *d)
 }
 
 static struct irq_chip ltq_irq_type = {
-       "icu",
+       .name = "icu",
        .irq_enable = ltq_enable_irq,
        .irq_disable = ltq_disable_irq,
        .irq_unmask = ltq_enable_irq,
@@ -216,7 +216,7 @@ static struct irq_chip ltq_irq_type = {
 };
 
 static struct irq_chip ltq_eiu_type = {
-       "eiu",
+       .name = "eiu",
        .irq_startup = ltq_startup_eiu_irq,
        .irq_shutdown = ltq_shutdown_eiu_irq,
        .irq_enable = ltq_enable_irq,