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 20/32] PCI/niu: use PCIe capabilities access functions to simplify implementation
    Date
    From: Jiang Liu <jiang.liu@huawei.com>

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

    Signed-off-by: Jiang Liu <liuj97@gmail.com>
    ---
    drivers/net/ethernet/sun/niu.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
    index 703c8cc..3f914c1 100644
    --- a/drivers/net/ethernet/sun/niu.c
    +++ b/drivers/net/ethernet/sun/niu.c
    @@ -9768,7 +9768,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
    union niu_parent_id parent_id;
    struct net_device *dev;
    struct niu *np;
    - int err, pos;
    + int err;
    u64 dma_mask;
    u16 val16;

    @@ -9793,8 +9793,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
    goto err_out_disable_pdev;
    }

    - pos = pci_pcie_cap(pdev);
    - if (pos <= 0) {
    + if (!pci_is_pcie(pdev)) {
    dev_err(&pdev->dev, "Cannot find PCI Express capability, aborting\n");
    goto err_out_free_res;
    }
    @@ -9819,14 +9818,14 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
    goto err_out_free_dev;
    }

    - pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16);
    + pci_pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &val16);
    val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
    val16 |= (PCI_EXP_DEVCTL_CERE |
    PCI_EXP_DEVCTL_NFERE |
    PCI_EXP_DEVCTL_FERE |
    PCI_EXP_DEVCTL_URRE |
    PCI_EXP_DEVCTL_RELAX_EN);
    - pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16);
    + pci_pcie_capability_write_word(pdev, PCI_EXP_DEVCTL, val16);

    dma_mask = DMA_BIT_MASK(44);
    err = pci_set_dma_mask(pdev, dma_mask);
    --
    1.7.9.5


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