Pcie_capability_xxx() interfaces were introudced to simplify code to access PCIe Cap config space. And because PCI core saves the PCIe Cap offset in set_pcie_port_type() when device is enumerated. So we can use pci_is_pcie() instead.
Signed-off-by: Yijing Wang <[email protected]> Cc: Jiang Liu <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: Naresh Kumar Inna <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Jesper Juhl <[email protected]> Cc: [email protected] Cc: [email protected] --- drivers/scsi/csiostor/csio_hw.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c index 0eb35b9..be9a6ef 100644 --- a/drivers/scsi/csiostor/csio_hw.c +++ b/drivers/scsi/csiostor/csio_hw.c @@ -856,15 +856,12 @@ static void csio_set_pcie_completion_timeout(struct csio_hw *hw, u8 range) { uint16_t val; - int pcie_cap; - if (!csio_pci_capability(hw->pdev, PCI_CAP_ID_EXP, &pcie_cap)) { - pci_read_config_word(hw->pdev, - pcie_cap + PCI_EXP_DEVCTL2, &val); + if (pci_is_pcie(hw->pdev)) { + pcie_capability_read_word(hw->pdev, PCI_EXP_DEVCTL2, &val); val &= 0xfff0; val |= range ; - pci_write_config_word(hw->pdev, - pcie_cap + PCI_EXP_DEVCTL2, val); + pcie_capability_write_word(hw->pdev, PCI_EXP_DEVCTL2, val); } } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
