Commit f92d155d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang

i2c: ismt: do not duplicate msi_enabled flag

struct pci_dev already has a flag to track if MSI is enabled or not. Use it
directly.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent fb8918b2
...@@ -172,7 +172,6 @@ struct ismt_priv { ...@@ -172,7 +172,6 @@ struct ismt_priv {
u8 head; /* ring buffer head pointer */ u8 head; /* ring buffer head pointer */
struct completion cmp; /* interrupt completion */ struct completion cmp; /* interrupt completion */
u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* temp R/W data buffer */ 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, ...@@ -398,7 +397,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write); desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write);
/* Initialize common control bits */ /* 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; desc->control = ISMT_DESC_INT | ISMT_DESC_FAIR;
else else
desc->control = ISMT_DESC_FAIR; desc->control = ISMT_DESC_FAIR;
...@@ -806,7 +805,6 @@ static int ismt_int_init(struct ismt_priv *priv) ...@@ -806,7 +805,6 @@ static int ismt_int_init(struct ismt_priv *priv)
goto intx; goto intx;
} }
priv->using_msi = true;
goto done; goto done;
/* Try using legacy interrupts */ /* Try using legacy interrupts */
...@@ -822,8 +820,6 @@ static int ismt_int_init(struct ismt_priv *priv) ...@@ -822,8 +820,6 @@ static int ismt_int_init(struct ismt_priv *priv)
return -ENODEV; return -ENODEV;
} }
priv->using_msi = false;
done: done:
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment