i2c: ismt: do not duplicate msi_enabled flag
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 16 Sep 2015 14:24:00 +0000 (17:24 +0300)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 20 Oct 2015 14:51:40 +0000 (16:51 +0200)
struct pci_dev already has a flag to track if MSI is enabled or not. Use it
directly.

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 3889e6b4176d3f0e04af8aa7c625134f2cce0458..3cc20f35ae8af412028b2d664fbe1308cf54b0b4 100644 (file)
@@ -172,7 +172,6 @@ struct ismt_priv {
        u8 head;                                /* ring buffer head pointer */
        struct completion cmp;                  /* interrupt completion */
        u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* temp R/W data buffer */
-       bool using_msi;                         /* type of interrupt flag */
 };
 
 /**
@@ -398,7 +397,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
        desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write);
 
        /* Initialize common control bits */
-       if (likely(priv->using_msi))
+       if (likely(pci_dev_msi_enabled(priv->pci_dev)))
                desc->control = ISMT_DESC_INT | ISMT_DESC_FAIR;
        else
                desc->control = ISMT_DESC_FAIR;
@@ -806,7 +805,6 @@ static int ismt_int_init(struct ismt_priv *priv)
                goto intx;
        }
 
-       priv->using_msi = true;
        goto done;
 
        /* Try using legacy interrupts */
@@ -822,8 +820,6 @@ intx:
                return -ENODEV;
        }
 
-       priv->using_msi = false;
-
 done:
        return 0;
 }