diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index ca5084743135..a44653b42161 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -685,7 +685,7 @@ qla24xx_pci_config(scsi_qla_host_t *vha) | |||
685 | pcix_set_mmrbc(ha->pdev, 2048); | 685 | pcix_set_mmrbc(ha->pdev, 2048); |
686 | 686 | ||
687 | /* PCIe -- adjust Maximum Read Request Size (2048). */ | 687 | /* PCIe -- adjust Maximum Read Request Size (2048). */ |
688 | if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP)) | 688 | if (pci_is_pcie(ha->pdev)) |
689 | pcie_set_readrq(ha->pdev, 2048); | 689 | pcie_set_readrq(ha->pdev, 2048); |
690 | 690 | ||
691 | pci_disable_rom(ha->pdev); | 691 | pci_disable_rom(ha->pdev); |
@@ -721,7 +721,7 @@ qla25xx_pci_config(scsi_qla_host_t *vha) | |||
721 | pci_write_config_word(ha->pdev, PCI_COMMAND, w); | 721 | pci_write_config_word(ha->pdev, PCI_COMMAND, w); |
722 | 722 | ||
723 | /* PCIe -- adjust Maximum Read Request Size (2048). */ | 723 | /* PCIe -- adjust Maximum Read Request Size (2048). */ |
724 | if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP)) | 724 | if (pci_is_pcie(ha->pdev)) |
725 | pcie_set_readrq(ha->pdev, 2048); | 725 | pcie_set_readrq(ha->pdev, 2048); |
726 | 726 | ||
727 | pci_disable_rom(ha->pdev); | 727 | pci_disable_rom(ha->pdev); |
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index caf627ba7fa8..9ce3a8f8754f 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -1620,7 +1620,7 @@ qla82xx_pci_info_str(struct scsi_qla_host *vha, char *str) | |||
1620 | char lwstr[6]; | 1620 | char lwstr[6]; |
1621 | uint16_t lnk; | 1621 | uint16_t lnk; |
1622 | 1622 | ||
1623 | pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); | 1623 | pcie_reg = pci_pcie_cap(ha->pdev); |
1624 | pci_read_config_word(ha->pdev, pcie_reg + PCI_EXP_LNKSTA, &lnk); | 1624 | pci_read_config_word(ha->pdev, pcie_reg + PCI_EXP_LNKSTA, &lnk); |
1625 | ha->link_width = (lnk >> 4) & 0x3f; | 1625 | ha->link_width = (lnk >> 4) & 0x3f; |
1626 | 1626 | ||
@@ -2528,7 +2528,7 @@ qla82xx_start_firmware(scsi_qla_host_t *vha) | |||
2528 | } | 2528 | } |
2529 | 2529 | ||
2530 | /* Negotiated Link width */ | 2530 | /* Negotiated Link width */ |
2531 | pcie_cap = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); | 2531 | pcie_cap = pci_pcie_cap(ha->pdev); |
2532 | pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk); | 2532 | pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk); |
2533 | ha->link_width = (lnk >> 4) & 0x3f; | 2533 | ha->link_width = (lnk >> 4) & 0x3f; |
2534 | 2534 | ||
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 6d1d873a20e2..fb8cd3847d4b 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -482,12 +482,12 @@ qla24xx_pci_info_str(struct scsi_qla_host *vha, char *str) | |||
482 | uint32_t pci_bus; | 482 | uint32_t pci_bus; |
483 | int pcie_reg; | 483 | int pcie_reg; |
484 | 484 | ||
485 | pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); | 485 | pcie_reg = pci_pcie_cap(ha->pdev); |
486 | if (pcie_reg) { | 486 | if (pcie_reg) { |
487 | char lwstr[6]; | 487 | char lwstr[6]; |
488 | uint16_t pcie_lstat, lspeed, lwidth; | 488 | uint16_t pcie_lstat, lspeed, lwidth; |
489 | 489 | ||
490 | pcie_reg += 0x12; | 490 | pcie_reg += PCI_EXP_LNKCAP; |
491 | pci_read_config_word(ha->pdev, pcie_reg, &pcie_lstat); | 491 | pci_read_config_word(ha->pdev, pcie_reg, &pcie_lstat); |
492 | lspeed = pcie_lstat & (BIT_0 | BIT_1 | BIT_2 | BIT_3); | 492 | lspeed = pcie_lstat & (BIT_0 | BIT_1 | BIT_2 | BIT_3); |
493 | lwidth = (pcie_lstat & | 493 | lwidth = (pcie_lstat & |