Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / qla4xxx / ql4_nx.c

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 66f52d2b5cd49497b5b81219235417dd1f8361db..499a92db1cf64d3b1d44201592b289aefd38cd71 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1640,7 +1640,6 @@ qla4_8xxx_set_qsnt_ready(struct scsi_qla_host *ha)
 static int
 qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
 {
-       int pcie_cap;
        uint16_t lnk;
 
        /* scrub dma mask expansion register */
@@ -1664,8 +1663,7 @@ qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
        }
 
        /* Negotiated Link width */
-       pcie_cap = pci_pcie_cap(ha->pdev);
-       pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk);
+       pcie_capability_read_word(ha->pdev, PCI_EXP_LNKSTA, &lnk);
        ha->link_width = (lnk >> 4) & 0x3f;
 
        /* Synchronize with Receive peg */