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-thunderx-pcidrv.c | |
| parent | i2c: exynos5: fix arbitration lost handling (diff) | |
| download | linux-4c21541d8da17fbe94ecadbfc913d6dff3be7ca2.tar.xz linux-4c21541d8da17fbe94ecadbfc913d6dff3be7ca2.zip | |
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-thunderx-pcidrv.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-thunderx-pcidrv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index bba5b429f69c..1d4c2beacf2e 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -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; |