aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2010-02-22 00:13:39 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-02-22 19:21:21 -0500
commitb16694f70c40ea8d539cdc93a422039771e85870 (patch)
tree2ac80b596bff438d84c13224076aa474a3c8053c /drivers/pci
parent6cbf82148ff286ec22a55be6836c3a5bffc489c1 (diff)
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie/pme/pcie_pme.c8
1 files changed, 4 insertions, 4 deletions
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)
105 int rtctl_pos; 105 int rtctl_pos;
106 u16 rtctl; 106 u16 rtctl;
107 107
108 rtctl_pos = pci_find_capability(dev, PCI_CAP_ID_EXP) + PCI_EXP_RTCTL; 108 rtctl_pos = pci_pcie_cap(dev) + PCI_EXP_RTCTL;
109 109
110 pci_read_config_word(dev, rtctl_pos, &rtctl); 110 pci_read_config_word(dev, rtctl_pos, &rtctl);
111 if (enable) 111 if (enable)
@@ -124,7 +124,7 @@ static void pcie_pme_clear_status(struct pci_dev *dev)
124 int rtsta_pos; 124 int rtsta_pos;
125 u32 rtsta; 125 u32 rtsta;
126 126
127 rtsta_pos = pci_find_capability(dev, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA; 127 rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
128 128
129 pci_read_config_dword(dev, rtsta_pos, &rtsta); 129 pci_read_config_dword(dev, rtsta_pos, &rtsta);
130 rtsta |= PCI_EXP_RTSTA_PME; 130 rtsta |= PCI_EXP_RTSTA_PME;
@@ -278,7 +278,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
278 int rtsta_pos; 278 int rtsta_pos;
279 u32 rtsta; 279 u32 rtsta;
280 280
281 rtsta_pos = pci_find_capability(port, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA; 281 rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA;
282 282
283 spin_lock_irq(&data->lock); 283 spin_lock_irq(&data->lock);
284 284
@@ -332,7 +332,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)
332 port = ((struct pcie_device *)context)->port; 332 port = ((struct pcie_device *)context)->port;
333 data = get_service_data((struct pcie_device *)context); 333 data = get_service_data((struct pcie_device *)context);
334 334
335 rtsta_pos = pci_find_capability(port, PCI_CAP_ID_EXP) + PCI_EXP_RTSTA; 335 rtsta_pos = pci_pcie_cap(port) + PCI_EXP_RTSTA;
336 336
337 spin_lock_irqsave(&data->lock, flags); 337 spin_lock_irqsave(&data->lock, flags);
338 pci_read_config_dword(port, rtsta_pos, &rtsta); 338 pci_read_config_dword(port, rtsta_pos, &rtsta);