From: Jiang Liu Date: Mon, 20 Aug 2012 20:25:06 +0000 (-0600) Subject: [SCSI] qla4xxx: Use PCI Express Capability accessors X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5548bfd0eef185b76b421c871af7720c65737578;p=linux-beck.git [SCSI] qla4xxx: Use PCI Express Capability accessors Use PCI Express Capability access functions to simplify qla4xxx driver. Signed-off-by: Jiang Liu Signed-off-by: Bjorn Helgaas --- 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) 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 */