]> Pileus Git - ~andy/linux/commitdiff
rtl8192e: Use PCI Express Capability accessors
authorJiang Liu <jiang.liu@huawei.com>
Tue, 24 Jul 2012 09:20:33 +0000 (17:20 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 23 Aug 2012 16:11:16 +0000 (10:11 -0600)
Use PCI Express Capability access functions to simplify rtl8192e driver.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/staging/rtl8192e/rtl8192e/rtl_pci.c

index ddadcc3e4e7ced74a4fa21ee6409e306886a2d57..5abbee37cdca1c1a482c410492f71c1e8c5a74eb 100644 (file)
@@ -31,12 +31,10 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
        u8 tmp;
-       int pos;
-       u8 LinkCtrlReg;
+       u16 LinkCtrlReg;
 
-       pos = pci_find_capability(priv->pdev, PCI_CAP_ID_EXP);
-       pci_read_config_byte(priv->pdev, pos + PCI_EXP_LNKCTL, &LinkCtrlReg);
-       priv->NdisAdapter.LinkCtrlReg = LinkCtrlReg;
+       pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &LinkCtrlReg);
+       priv->NdisAdapter.LinkCtrlReg = (u8)LinkCtrlReg;
 
        RT_TRACE(COMP_INIT, "Link Control Register =%x\n",
                 priv->NdisAdapter.LinkCtrlReg);