Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konra...

[karo-tx-linux.git] / drivers / mfd / twl6040-irq.c

diff --git a/drivers/mfd/twl6040-irq.c b/drivers/mfd/twl6040-irq.c
index 93805354152058e433d66644df61d795bc4d0685..b3f8ddaa28a8b792c14d2b5c785ffed4b099a735 100644 (file)
--- a/drivers/mfd/twl6040-irq.c
+++ b/drivers/mfd/twl6040-irq.c
@@ -148,19 +148,6 @@ int twl6040_irq_init(struct twl6040 *twl6040)
        twl6040->irq_masks_cache = TWL6040_ALLINT_MSK;
        twl6040_reg_write(twl6040, TWL6040_REG_INTMR, TWL6040_ALLINT_MSK);
 
-       if (!twl6040->irq) {
-               dev_warn(twl6040->dev,
-                        "no interrupt specified, no interrupts\n");
-               twl6040->irq_base = 0;
-               return 0;
-       }
-
-       if (!twl6040->irq_base) {
-               dev_err(twl6040->dev,
-                       "no interrupt base specified, no interrupts\n");
-               return 0;
-       }
-
        /* Register them with genirq */
        for (cur_irq = twl6040->irq_base;
             cur_irq < twl6040->irq_base + ARRAY_SIZE(twl6040_irqs);
@@ -199,7 +186,6 @@ EXPORT_SYMBOL(twl6040_irq_init);
 
 void twl6040_irq_exit(struct twl6040 *twl6040)
 {
-       if (twl6040->irq)
-               free_irq(twl6040->irq, twl6040);
+       free_irq(twl6040->irq, twl6040);
 }
 EXPORT_SYMBOL(twl6040_irq_exit);