i2c: designware: Simplify master interrupt handler nesting

In my opinion a few lines of spurious interrupt detection code can be
moved to the actual master interrupt handling function i2c_dw_isr()
without hurting readability.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 9c2c9d002dc340fce7c83aa60c403643d01601c4..dfb499e54c05d06f91a54f01edc9e443cfebd197 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -711,9 +711,18 @@ static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev)
  * Interrupt service routine. This gets called whenever an I2C master interrupt
  * occurs.
  */
-static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev)
+static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
 {
-       u32 stat;
+       struct dw_i2c_dev *dev = dev_id;
+       u32 stat, enabled;
+
+       regmap_read(dev->map, DW_IC_ENABLE, &enabled);
+       regmap_read(dev->map, DW_IC_RAW_INTR_STAT, &stat);
+       if (!enabled || !(stat & ~DW_IC_INTR_ACTIVITY))
+               return IRQ_NONE;
+       if (pm_runtime_suspended(dev->dev) || stat == GENMASK(31, 0))
+               return IRQ_NONE;
+       dev_dbg(dev->dev, "enabled=%#x stat=%#x\n", enabled, stat);
 
        stat = i2c_dw_read_clear_intrbits(dev);
 
@@ -726,7 +735,7 @@ static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev)
                 * the HW active).
                 */
                regmap_write(dev->map, DW_IC_INTR_MASK, 0);
-               return 0;
+               return IRQ_HANDLED;
        }
 
        if (stat & DW_IC_INTR_TX_ABRT) {
@@ -765,24 +774,6 @@ tx_aborted:
                regmap_write(dev->map, DW_IC_INTR_MASK, stat);
        }
 
-       return 0;
-}
-
-static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)
-{
-       struct dw_i2c_dev *dev = dev_id;
-       u32 stat, enabled;
-
-       regmap_read(dev->map, DW_IC_ENABLE, &enabled);
-       regmap_read(dev->map, DW_IC_RAW_INTR_STAT, &stat);
-       if (!enabled || !(stat & ~DW_IC_INTR_ACTIVITY))
-               return IRQ_NONE;
-       if (pm_runtime_suspended(dev->dev) || stat == GENMASK(31, 0))
-               return IRQ_NONE;
-       dev_dbg(dev->dev, "enabled=%#x stat=%#x\n", enabled, stat);
-
-       i2c_dw_irq_handler_master(dev);
-
        return IRQ_HANDLED;
 }