Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next

Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 3 insertions, 9 deletions

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 9ce3a8f8754..7cfdf2bd8ed 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1615,13 +1615,11 @@ qla82xx_get_fw_offs(struct qla_hw_data *ha)
 char *
 qla82xx_pci_info_str(struct scsi_qla_host *vha, char *str)
 {
-        int pcie_reg;
         struct qla_hw_data *ha = vha->hw;
         char lwstr[6];
         uint16_t lnk;
 
-        pcie_reg = pci_pcie_cap(ha->pdev);
-        pci_read_config_word(ha->pdev, pcie_reg + PCI_EXP_LNKSTA, &lnk);
+        pcie_capability_read_word(ha->pdev, PCI_EXP_LNKSTA, &lnk);
         ha->link_width = (lnk >> 4) & 0x3f;
 
         strcpy(str, "PCIe (");
@@ -2497,7 +2495,6 @@ fw_load_failed:
 int
 qla82xx_start_firmware(scsi_qla_host_t *vha)
 {
-        int           pcie_cap;
         uint16_t      lnk;
         struct qla_hw_data *ha = vha->hw;
 
@@ -2528,8 +2525,7 @@ qla82xx_start_firmware(scsi_qla_host_t *vha)
         }
 
         /* 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 */
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 939d7261c37..807bf76f1b6 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1566,7 +1566,6 @@ qla4_8xxx_set_qsnt_ready(struct scsi_qla_host *ha)
 static int
 qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
 {
-        int pcie_cap;
         uint16_t lnk;
 
         /* scrub dma mask expansion register */
@@ -1590,8 +1589,7 @@ qla4_8xxx_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 */