MFD: twl6040: Demand valid interrupt configuration

In order to operate correctly twl6040 needs correct
interrupt configuration.
The slave drivers (vibra, and ASoC codec) will refuse
to probe, if the interrupt configuration is not correct.
In this way some checks can be removed from the code.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 471f4895fb9089b490f406aaed35d10d72ef9d7e..f71bb147d11cc2df3cce2e12741473b141ceea8f 100644 (file)
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -459,6 +459,12 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
+       /* In order to operate correctly we need valid interrupt config */
+       if (!pdata->naudint_irq || !pdata->irq_base) {
+               dev_err(&pdev->dev, "Invalid IRQ configuration\n");
+               return -EINVAL;
+       }
+
        twl6040 = kzalloc(sizeof(struct twl6040), GFP_KERNEL);
        if (!twl6040)
                return -ENOMEM;
@@ -491,20 +497,18 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
        if (twl6040->rev == TWL6040_REV_ES1_0)
                twl6040->audpwron = -EINVAL;
 
-       if (twl6040->irq) {
-               /* codec interrupt */
-               ret = twl6040_irq_init(twl6040);
-               if (ret)
-                       goto gpio2_err;
-
-               ret = twl6040_request_irq(twl6040, TWL6040_IRQ_READY,
-                                         twl6040_naudint_handler, 0,
-                                         "twl6040_irq_ready", twl6040);
-               if (ret) {
-                       dev_err(twl6040->dev, "READY IRQ request failed: %d\n",
-                               ret);
-                       goto irq_err;
-               }
+       /* codec interrupt */
+       ret = twl6040_irq_init(twl6040);
+       if (ret)
+               goto gpio2_err;
+
+       ret = twl6040_request_irq(twl6040, TWL6040_IRQ_READY,
+                                       twl6040_naudint_handler, 0,
+                                       "twl6040_irq_ready", twl6040);
+       if (ret) {
+               dev_err(twl6040->dev, "READY IRQ request failed: %d\n",
+                       ret);
+               goto irq_err;
        }
 
        /* dual-access registers controlled by I2C only */
@@ -553,11 +557,9 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
        return 0;
 
 mfd_err:
-       if (twl6040->irq)
-               twl6040_free_irq(twl6040, TWL6040_IRQ_READY, twl6040);
+       twl6040_free_irq(twl6040, TWL6040_IRQ_READY, twl6040);
 irq_err:
-       if (twl6040->irq)
-               twl6040_irq_exit(twl6040);
+       twl6040_irq_exit(twl6040);
 gpio2_err:
        if (gpio_is_valid(twl6040->audpwron))
                gpio_free(twl6040->audpwron);
@@ -579,9 +581,7 @@ static int __devexit twl6040_remove(struct platform_device *pdev)
                gpio_free(twl6040->audpwron);
 
        twl6040_free_irq(twl6040, TWL6040_IRQ_READY, twl6040);
-
-       if (twl6040->irq)
-               twl6040_irq_exit(twl6040);
+       twl6040_irq_exit(twl6040);
 
        mfd_remove_devices(&pdev->dev);
        platform_set_drvdata(pdev, NULL);

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);