Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / mfd / twl6030-irq.c

diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 4082ed7..dfbae34 100644 (file)
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -140,22 +140,7 @@ static int twl6030_irq_thread(void *data)
                        if (sts.int_sts & 0x1) {
                                int module_irq = twl6030_irq_base +
                                        twl6030_interrupt_mapping[i];
-                               struct irq_desc *d = irq_to_desc(module_irq);
-
-                               if (!d) {
-                                       pr_err("twl6030: Invalid SIH IRQ: %d\n",
-                                              module_irq);
-                                       return -EINVAL;
-                               }
-
-                               /* These can't be masked ... always warn
-                                * if we get any surprises.
-                                */
-                               if (d->status & IRQ_DISABLED)
-                                       note_interrupt(module_irq, d,
-                                                       IRQ_NONE);
-                               else
-                                       d->handle_irq(module_irq, d);
+                               generic_handle_irq(module_irq);
 
                        }
                local_irq_enable();
@@ -198,7 +183,7 @@ static inline void activate_irq(int irq)
        set_irq_flags(irq, IRQF_VALID);
 #else
        /* same effect on other architectures */
-       set_irq_noprobe(irq);
+       irq_set_noprobe(irq);
 #endif
 }
 
@@ -244,7 +229,7 @@ int twl6030_mmc_card_detect_config(void)
        twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK,
                                                REG_INT_MSK_STS_B);
        /*
-        * Intially Configuring MMC_CTRL for receving interrupts &
+        * Initially Configuring MMC_CTRL for receiving interrupts &
         * Card status on TWL6030 for MMC1
         */
        ret = twl_i2c_read_u8(TWL6030_MODULE_ID0, &reg_val, TWL6030_MMCCTRL);
@@ -290,7 +275,7 @@ int twl6030_mmc_card_detect(struct device *dev, int slot)
                /* TWL6030 provide's Card detect support for
                 * only MMC1 controller.
                 */
-               pr_err("Unkown MMC controller %d in %s\n", pdev->id, __func__);
+               pr_err("Unknown MMC controller %d in %s\n", pdev->id, __func__);
                return ret;
        }
        /*
@@ -335,8 +320,8 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)
        twl6030_irq_chip.irq_set_type = NULL;
 
        for (i = irq_base; i < irq_end; i++) {
-               set_irq_chip_and_handler(i, &twl6030_irq_chip,
-                               handle_simple_irq);
+               irq_set_chip_and_handler(i, &twl6030_irq_chip,
+                                        handle_simple_irq);
                activate_irq(i);
        }
 
@@ -365,7 +350,7 @@ fail_irq:
 
 fail_kthread:
        for (i = irq_base; i < irq_end; i++)
-               set_irq_chip_and_handler(i, NULL, NULL);
+               irq_set_chip_and_handler(i, NULL, NULL);
        return status;
 }