-----Original Message-----
From: Jiang Liu [mailto:liuj97@gmail.com]
Sent: Thursday, August 02, 2012 12:54 AM
To: Bjorn Helgaas; Don Dutile
Cc: Jiang Liu; Yinghai Lu; Izumi, Taku/泉 拓; Rafael J . Wysocki; Kaneshige,
Kenji/金重 憲治; Yijing Wang; linux-kernel@vger.kernel.org;
linux-pci@vger.kernel.org; Jiang Liu
Subject: [PATCH v3 06/32] PCI/hotplug: use PCIe capabilities access
functions to simplify implementation

From: Jiang Liu <redacted>

Use PCIe capabilities access functions to simplify cpihp_slot.c.

Signed-off-by: Jiang Liu <redacted>
---
 drivers/pci/hotplug/pcihp_slot.c |   20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/pci/hotplug/pcihp_slot.c

b/drivers/pci/hotplug/pcihp_slot.c
index 8c05a18..649dcc8 100644

--- a/drivers/pci/hotplug/pcihp_slot.c
+++ b/drivers/pci/hotplug/pcihp_slot.c

@@ -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);
+	pci_pcie_capability_change_word(dev, PCI_EXP_DEVCTL,
+			hpp->pci_exp_devctl_or,
~hpp->pci_exp_devctl_and);

 	/* 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)
+		pci_pcie_capability_change_word(dev, PCI_EXP_LNKCTL,
+			hpp->pci_exp_lnkctl_or,
~hpp->pci_exp_lnkctl_and);

 	/* Find Advanced Error Reporting Enhanced Capability */
 	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
--
1.7.9.5