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>
This commit is contained in:
parent
7999eecb7e
commit
4c21541d8d
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -188,11 +188,11 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
|
|||
i2c->hlc_int_enable = thunder_i2c_hlc_int_enable;
|
||||
i2c->hlc_int_disable = thunder_i2c_hlc_int_disable;
|
||||
|
||||
ret = pci_enable_msix(pdev, &i2c->i2c_msix, 1);
|
||||
if (ret)
|
||||
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);
|
||||
if (ret < 0)
|
||||
goto error;
|
||||
|
||||
ret = devm_request_irq(dev, i2c->i2c_msix.vector, octeon_i2c_isr, 0,
|
||||
ret = devm_request_irq(dev, pci_irq_vector(pdev, 0), octeon_i2c_isr, 0,
|
||||
DRV_NAME, i2c);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
|
Loading…
Reference in a new issue