From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Mon, 22 Feb 2010 05:13:39 +0000 (+0900)
Subject: PCIe PME: use pci_pcie_cap()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b16694f70c40ea8d539cdc93a422039771e85870;p=deliverable%2Flinux.git

PCIe PME: use pci_pcie_cap()

Use pci_pcie_cap() instead of pci_find_capability() to get PCIe
capability offset. This reduces redundant search in PCI configuration
space.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/drivers/pci/pcie/pme/pcie_pme.c b/drivers/pci/pcie/pme/pcie_pme.c
index 6b516309c094..7b3cbff547ee 100644
--- a/drivers/pci/pcie/pme/pcie_pme.c
+++ b/drivers/pci/pcie/pme/pcie_pme.c
@@ -105,7 +105,7 @@ static void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable)
 	int rtctl_pos;
 	u16 rtctl;
 
-	rtctl_pos = pci_find_capability(dev, PCI_CAP_ID_EXP) + PCI_EXP_RTCTL;
+	rtctl_pos = pci_pcie_cap(dev) + PCI_EXP_RTCTL;
 
 	pci_read_config_word(dev, rtctl_pos, &rtctl);
 	if (enable)
@@ -124,7 +124,7 @@ static void pcie_pme_clear_status(struct pci_dev *dev)
 	int rtsta_pos;
 	u32 rtsta;
 
-	rtsta_pos = pci_find_capability(dev, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA;
+	rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
 
 	pci_read_config_dword(dev, rtsta_pos, &rtsta);
 	rtsta |= PCI_EXP_RTSTA_PME;
@@ -278,7 +278,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
 	int rtsta_pos;
 	u32 rtsta;
 
-	rtsta_pos = pci_find_capability(port, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA;
+	rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA;
 
 	spin_lock_irq(&data->lock);
 
@@ -332,7 +332,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)
 	port = ((struct pcie_device *)context)->port;
 	data = get_service_data((struct pcie_device *)context);
 
-	rtsta_pos = pci_find_capability(port, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA;
+	rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA;
 
 	spin_lock_irqsave(&data->lock, flags);
 	pci_read_config_dword(port, rtsta_pos, &rtsta);