iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI/hotplug: Use PCI Express Capability accessors

Browse Source 
Use PCI Express Capability access functions to simplify pcihp_slot.c.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
This commit is contained in:
Jiang Liu 2012-07-24 17:20:07 +08:00 committed by Bjorn Helgaas
parent 76b57c6700
commit 028fbad480
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/hotplug/pcihp_slot.c
View File

@ -96,17 +96,11 @@ static void program_hpp_type1(struct pci_dev *dev, struct hpp_type1 *hpp)
static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
{ {
int pos; int pos;
u16 reg16;
u32 reg32; u32 reg32;
if (!hpp) if (!hpp)
return; return;
/* Find PCI Express capability */
pos = pci_pcie_cap(dev);
if (!pos)
return;
if (hpp->revision > 1) { if (hpp->revision > 1) {
dev_warn(&dev->dev, "PCIe settings rev %d not supported\n", dev_warn(&dev->dev, "PCIe settings rev %d not supported\n",
hpp->revision); hpp->revision);
@ -114,17 +108,13 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp)
} }
/* Initialize Device Control Register */ /* Initialize Device Control Register */
pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &reg16); pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL,
reg16 = (reg16 & hpp->pci_exp_devctl_and) | hpp->pci_exp_devctl_or; ~hpp->pci_exp_devctl_and, hpp->pci_exp_devctl_or);
pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, reg16);
/* Initialize Link Control Register */ /* Initialize Link Control Register */
if (dev->subordinate) { if (dev->subordinate)
pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &reg16); pcie_capability_clear_and_set_word(dev, PCI_EXP_LNKCTL,
reg16 = (reg16 & hpp->pci_exp_lnkctl_and) ~hpp->pci_exp_lnkctl_and, hpp->pci_exp_lnkctl_or);
| hpp->pci_exp_lnkctl_or;
pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, reg16);
}
/* Find Advanced Error Reporting Enhanced Capability */ /* Find Advanced Error Reporting Enhanced Capability */
pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);