diff options
author | Jan Glauber <jglauber@cavium.com> | 2017-02-21 14:07:50 +0100 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2017-02-23 13:03:56 +0100 |
commit | 4c21541d8da17fbe94ecadbfc913d6dff3be7ca2 (patch) | |
tree | a98ded9e179bcf1e36f66cafe8fad6573b6b4e7f /drivers/i2c/busses/i2c-octeon-core.h | |
parent | 7999eecb7e5675c3c7c2981a3ba9be6fc8e2ee27 (diff) | |
download | op-kernel-dev-4c21541d8da17fbe94ecadbfc913d6dff3be7ca2.zip op-kernel-dev-4c21541d8da17fbe94ecadbfc913d6dff3be7ca2.tar.gz |
i2c: thunderx: Replace pci_enable_msix()
Using pci_alloc_irq_vectors() instead of the deprecated
pci_enable_msix() allows to remove the msix_entry from
struct octeon_i2c and thus to get rid of the config symbol check.
Signed-off-by: Jan Glauber <jglauber@cavium.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-octeon-core.h')
-rw-r--r-- | drivers/i2c/busses/i2c-octeon-core.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index e160f83..aa3c8f4 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h @@ -6,7 +6,6 @@ #include <linux/i2c-smbus.h> #include <linux/io.h> #include <linux/kernel.h> -#include <linux/pci.h> /* Controller command patterns */ #define SW_TWSI_V BIT_ULL(63) /* Valid bit */ @@ -118,9 +117,6 @@ struct octeon_i2c { void (*hlc_int_disable)(struct octeon_i2c *); atomic_t int_enable_cnt; atomic_t hlc_int_enable_cnt; -#if IS_ENABLED(CONFIG_I2C_THUNDERX) - struct msix_entry i2c_msix; -#endif struct i2c_smbus_alert_setup alert_data; struct i2c_client *ara; }; |