| Message ID | 1378193715-25328-7-git-send-email-wangyijing@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
Looks good. Acked-by: Chad Dupuis <chad.dupuis@qlogic.com> On Tue, 3 Sep 2013, Yijing Wang wrote: > Use pci_is_pcie() instead of pci_find_capability > to simplify code. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > Cc: Andrew Vasquez <andrew.vasquez@qlogic.com> > Cc: linux-driver@qlogic.com > Cc: "James E.J. Bottomley" <JBottomley@parallels.com> > Cc: linux-scsi@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > 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 d799379..5f74271 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) > pci_write_config_word(ha->pdev, PCI_COMMAND, w); > > /* PCIe -- adjust Maximum Read Request Size (2048). */ > - if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP)) > + if (pci_is_pcie(ha->pdev)) > pcie_set_readrq(ha->pdev, 2048); > > ha->chip_revision = ha->pdev->revision; > @@ -660,10 +660,8 @@ char * > qlafx00_pci_info_str(struct scsi_qla_host *vha, char *str) > { > struct qla_hw_data *ha = vha->hw; > - int pcie_reg; > > - pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); > - if (pcie_reg) { > + if (pci_is_pcie(ha->pdev)) { > strcpy(str, "PCIe iSA"); > return str; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c index d799379..5f74271 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) pci_write_config_word(ha->pdev, PCI_COMMAND, w); /* PCIe -- adjust Maximum Read Request Size (2048). */ - if (pci_find_capability(ha->pdev, PCI_CAP_ID_EXP)) + if (pci_is_pcie(ha->pdev)) pcie_set_readrq(ha->pdev, 2048); ha->chip_revision = ha->pdev->revision; @@ -660,10 +660,8 @@ char * qlafx00_pci_info_str(struct scsi_qla_host *vha, char *str) { struct qla_hw_data *ha = vha->hw; - int pcie_reg; - pcie_reg = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP); - if (pcie_reg) { + if (pci_is_pcie(ha->pdev)) { strcpy(str, "PCIe iSA"); return str; }
Use pci_is_pcie() instead of pci_find_capability to simplify code. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Andrew Vasquez <andrew.vasquez@qlogic.com> Cc: linux-driver@qlogic.com Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Cc: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/scsi/qla2xxx/qla_mr.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)