From ef3c64bca671ad0b8542d22337c668b0fe9d1084 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Mon, 20 Aug 2012 14:25:06 -0600 Subject: [PATCH] --- yaml --- r: 324195 b: refs/heads/master c: 5548bfd0eef185b76b421c871af7720c65737578 h: refs/heads/master i: 324193: d21fe11ded48cc9f38a051a2ee00b210e3598bb7 324191: d23d364080d5f30c3c06df26724fe516fbea4a6c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_nx.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c56dd13be5e2..a16002cb1d7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10092438840729f2bc4892445db949b0e640835f +refs/heads/master: 5548bfd0eef185b76b421c871af7720c65737578 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_nx.c b/trunk/drivers/scsi/qla4xxx/ql4_nx.c index 939d7261c37a..807bf76f1b6a 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_nx.c +++ b/trunk/drivers/scsi/qla4xxx/ql4_nx.c @@ -1566,7 +1566,6 @@ qla4_8xxx_set_qsnt_ready(struct scsi_qla_host *ha) static int qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start) { - int pcie_cap; uint16_t lnk; /* scrub dma mask expansion register */ @@ -1590,8 +1589,7 @@ qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start) } /* Negotiated Link width */ - pcie_cap = pci_pcie_cap(ha->pdev); - pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk); + pcie_capability_read_word(ha->pdev, PCI_EXP_LNKSTA, &lnk); ha->link_width = (lnk >> 4) & 0x3f; /* Synchronize with Receive peg */