Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 028fbad4 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas
Browse files

PCI/hotplug: Use PCI Express Capability accessors 



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

Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
parent 76b57c67

drivers/pci/hotplug/pcihp_slot.c

+5 −15
Original line number Diff line number Diff line
@@ -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)

{

	int pos;

	u16 reg16;

	u32 reg32;



	if (!hpp)

		return;



	/* Find PCI Express capability */

	pos = pci_pcie_cap(dev);

	if (!pos)

		return;



	if (hpp->revision > 1) {

		dev_warn(&dev->dev, "PCIe settings rev %d not supported\n",

			 hpp->revision);
@@ -114,17 +108,13 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) 
	}



	/* Initialize Device Control Register */

	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &reg16);

	reg16 = (reg16 & hpp->pci_exp_devctl_and) | hpp->pci_exp_devctl_or;

	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, reg16);

	pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL,

			~hpp->pci_exp_devctl_and, hpp->pci_exp_devctl_or);



	/* Initialize Link Control Register */

	if (dev->subordinate) {

		pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &reg16);

		reg16 = (reg16 & hpp->pci_exp_lnkctl_and)

			| hpp->pci_exp_lnkctl_or;

		pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, reg16);

	}

	if (dev->subordinate)

		pcie_capability_clear_and_set_word(dev, PCI_EXP_LNKCTL,

			~hpp->pci_exp_lnkctl_and, hpp->pci_exp_lnkctl_or);



	/* Find Advanced Error Reporting Enhanced Capability */

	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);