diff options
author | Yijing Wang <wangyijing@huawei.com> | 2013-09-05 03:55:30 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 19:30:04 -0400 |
commit | ce9f7ed92adfc4c56c68d757e66fd1497dcf1130 (patch) | |
tree | 651c84e1fbb83aa607ed838c79b0f5767e6d2b10 | |
parent | ad4d35f865408a494f0a4c02b1c7ebd3f80f5dbf (diff) |
[SCSI] qla2xxx: Use pcie_is_pcie() to simplify code
Use pci_is_pcie() instead of pci_find_capability() to simplify code.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
Cc: linux-driver@qlogic.com
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_mr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c index 62ee7131b204..30d20e74e48a 100644 --- a/drivers/scsi/qla2xxx/qla_mr.c +++ b/drivers/scsi/qla2xxx/qla_mr.c | |||
@@ -507,7 +507,7 @@ qlafx00_pci_config(scsi_qla_host_t *vha) | |||
507 | pci_write_config_word(ha->pdev, PCI_COMMAND, w); | 507 | pci_write_config_word(ha->pdev, PCI_COMMAND, w); |
508 | 508 | ||
509 | /* PCIe -- adjust Maximum Read Request Size (2048). */ | 509 | /* PCIe -- adjust Maximum Read Request Size (2048). */ |
510 | if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP)) | 510 | if (pci_is_pcie(ha->pdev)) |
511 | pcie_set_readrq(ha->pdev, 2048); | 511 | pcie_set_readrq(ha->pdev, 2048); |
512 | 512 | ||
513 | ha->chip_revision = ha->pdev->revision; | 513 | ha->chip_revision = ha->pdev->revision; |
@@ -660,10 +660,8 @@ char * | |||
660 | qlafx00_pci_info_str(struct scsi_qla_host *vha, char *str) | 660 | qlafx00_pci_info_str(struct scsi_qla_host *vha, char *str) |
661 | { | 661 | { |
662 | struct qla_hw_data *ha = vha->hw; | 662 | struct qla_hw_data *ha = vha->hw; |
663 | int pcie_reg; | ||
664 | 663 | ||
665 | pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); | 664 | if (pci_is_pcie(ha->pdev)) { |
666 | if (pcie_reg) { | ||
667 | strcpy(str, "PCIe iSA"); | 665 | strcpy(str, "PCIe iSA"); |
668 | return str; | 666 | return str; |
669 | } | 667 | } |