UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

et131x: Use PCI Express Capability accessors 

Use PCI Express Capability access functions to simplify et131x driver.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu 2012-07-24 17:20:32 +08:00 committed by Bjorn Helgaas
parent 5cdaaf8a11
commit 532c5f69e2
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/et131x/et131x.c
View File

@ -3995,16 +3995,14 @@ static void et131x_hwaddr_init(struct et131x_adapter *adapter)
static int et131x_pci_init(struct et131x_adapter *adapter, static int et131x_pci_init(struct et131x_adapter *adapter,
struct pci_dev *pdev) struct pci_dev *pdev)
{ {
int cap = pci_pcie_cap(pdev);
u16 max_payload; u16 max_payload;
u16 ctl;
int i, rc; int i, rc;
rc = et131x_init_eeprom(adapter); rc = et131x_init_eeprom(adapter);
if (rc < 0) if (rc < 0)
goto out; goto out;
if (!cap) { if (!pci_is_pcie(pdev)) {
dev_err(&pdev->dev, "Missing PCIe capabilities\n"); dev_err(&pdev->dev, "Missing PCIe capabilities\n");
goto err_out; goto err_out;
} }
@ -4012,7 +4010,7 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
/* Let's set up the PORT LOGIC Register. First we need to know what /* Let's set up the PORT LOGIC Register. First we need to know what
* the max_payload_size is * the max_payload_size is
*/ */
if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCAP, &max_payload)) { if (pcie_capability_read_word(pdev, PCI_EXP_DEVCAP, &max_payload)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Could not read PCI config space for Max Payload Size\n"); "Could not read PCI config space for Max Payload Size\n");
goto err_out; goto err_out;
@ -4049,17 +4047,10 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
} }
/* Change the max read size to 2k */ /* Change the max read size to 2k */
if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &ctl)) { if (pcie_capability_clear_and_set_word(pdev, PCI_EXP_DEVCTL,
PCI_EXP_DEVCTL_READRQ, 0x4 << 12)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Could not read PCI config space for Max read size\n"); "Couldn't change PCI config space for Max read size\n");
goto err_out;
}
ctl = (ctl & ~PCI_EXP_DEVCTL_READRQ) | (0x04 << 12);
if (pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl)) {
dev_err(&pdev->dev,
"Could not write PCI config space for Max read size\n");
goto err_out; goto err_out;
} }