i2c: ismt: issue a warning when fail to request MSI
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 16 Sep 2015 14:24:02 +0000 (17:24 +0300)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 20 Oct 2015 14:51:42 +0000 (16:51 +0200)
Issue the warning in all error paths when unable to register MSI or its
handler.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-ismt.c

index 21cd4f6636bf3812f56211d26b1f84b4cdb1683b..80648be36cce8840d6f853423dda58def46aa6ce 100644 (file)
@@ -788,11 +788,8 @@ static int ismt_int_init(struct ismt_priv *priv)
 
        /* Try using MSI interrupts */
        err = pci_enable_msi(priv->pci_dev);
-       if (err) {
-               dev_warn(&priv->pci_dev->dev,
-                        "Unable to use MSI interrupts, falling back to legacy\n");
+       if (err)
                goto intx;
-       }
 
        err = devm_request_irq(&priv->pci_dev->dev,
                               priv->pci_dev->irq,
@@ -805,10 +802,13 @@ static int ismt_int_init(struct ismt_priv *priv)
                goto intx;
        }
 
-       goto done;
+       return 0;
 
        /* Try using legacy interrupts */
 intx:
+       dev_warn(&priv->pci_dev->dev,
+                "Unable to use MSI interrupts, falling back to legacy\n");
+
        err = devm_request_irq(&priv->pci_dev->dev,
                               priv->pci_dev->irq,
                               ismt_do_interrupt,
@@ -820,7 +820,6 @@ intx:
                return err;
        }
 
-done:
        return 0;
 }