lkml.org 
[lkml]   [2012]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 30/32] PCI/tsi721: use PCIe capabilities access functions to simplify implementation
    Date
    From: Jiang Liu <jiang.liu@huawei.com>

    Use PCIe capabilities access functions to simplify tsi721 driver's
    implementation.

    Signed-off-by: Jiang Liu <liuj97@gmail.com>
    ---
    drivers/rapidio/devices/tsi721.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
    index 722246c..4debfdc 100644
    --- a/drivers/rapidio/devices/tsi721.c
    +++ b/drivers/rapidio/devices/tsi721.c
    @@ -2212,7 +2212,7 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
    const struct pci_device_id *id)
    {
    struct tsi721_device *priv;
    - int i, cap;
    + int i;
    int err;
    u32 regval;

    @@ -2320,20 +2320,19 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
    dev_info(&pdev->dev, "Unable to set consistent DMA mask\n");
    }

    - cap = pci_pcie_cap(pdev);
    - BUG_ON(cap == 0);
    + BUG_ON(!pci_is_pcie(pdev));

    /* Clear "no snoop" and "relaxed ordering" bits, use default MRRS. */
    - pci_read_config_dword(pdev, cap + PCI_EXP_DEVCTL, &regval);
    + pci_pcie_capability_read_dword(pdev, PCI_EXP_DEVCTL, &regval);
    regval &= ~(PCI_EXP_DEVCTL_READRQ | PCI_EXP_DEVCTL_RELAX_EN |
    PCI_EXP_DEVCTL_NOSNOOP_EN);
    regval |= 0x2 << MAX_READ_REQUEST_SZ_SHIFT;
    - pci_write_config_dword(pdev, cap + PCI_EXP_DEVCTL, regval);
    + pci_pcie_capability_write_dword(pdev, PCI_EXP_DEVCTL, regval);

    /* Adjust PCIe completion timeout. */
    - pci_read_config_dword(pdev, cap + PCI_EXP_DEVCTL2, &regval);
    + pci_pcie_capability_read_dword(pdev, PCI_EXP_DEVCTL2, &regval);
    regval &= ~(0x0f);
    - pci_write_config_dword(pdev, cap + PCI_EXP_DEVCTL2, regval | 0x2);
    + pci_pcie_capability_write_dword(pdev, PCI_EXP_DEVCTL2, regval | 0x2);

    /*
    * FIXUP: correct offsets of MSI-X tables in the MSI-X Capability Block
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-07-24 19:41    [W:0.023 / U:30.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site