diff options
author | Jiang Liu <jiang.liu@huawei.com> | 2012-08-20 16:25:06 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 12:11:15 -0400 |
commit | 5548bfd0eef185b76b421c871af7720c65737578 (patch) | |
tree | 50b7b85cfd75dab82a5c9c91b645065a652e00d8 /drivers/scsi | |
parent | 10092438840729f2bc4892445db949b0e640835f (diff) |
[SCSI] qla4xxx: Use PCI Express Capability accessors
Use PCI Express Capability access functions to simplify qla4xxx driver.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 939d7261c37a..807bf76f1b6a 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) | |||
1566 | static int | 1566 | static int |
1567 | qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start) | 1567 | qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start) |
1568 | { | 1568 | { |
1569 | int pcie_cap; | ||
1570 | uint16_t lnk; | 1569 | uint16_t lnk; |
1571 | 1570 | ||
1572 | /* scrub dma mask expansion register */ | 1571 | /* scrub dma mask expansion register */ |
@@ -1590,8 +1589,7 @@ qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start) | |||
1590 | } | 1589 | } |
1591 | 1590 | ||
1592 | /* Negotiated Link width */ | 1591 | /* Negotiated Link width */ |
1593 | pcie_cap = pci_pcie_cap(ha->pdev); | 1592 | pcie_capability_read_word(ha->pdev, PCI_EXP_LNKSTA, &lnk); |
1594 | pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk); | ||
1595 | ha->link_width = (lnk >> 4) & 0x3f; | 1593 | ha->link_width = (lnk >> 4) & 0x3f; |
1596 | 1594 | ||
1597 | /* Synchronize with Receive peg */ | 1595 | /* Synchronize with Receive peg */ |