Skip to content

Commit

Permalink
PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
Browse files Browse the repository at this point in the history
PCI PM cap register offset has been saved in pci_pm_init(),
so we can use pdev->pm_cap instead of using pci_find_capability(..)
here.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Yijing Wang authored and Bjorn Helgaas committed Jun 18, 2013
1 parent fc6504b commit 728cdb7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
{
pci_power_t ret;

if (!pci_find_capability(dev, PCI_CAP_ID_PM))
if (!dev->pm_cap)
return PCI_D0;

ret = platform_pci_choose_state(dev);
Expand Down
6 changes: 2 additions & 4 deletions drivers/pci/quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,6 @@ static void quirk_e100_interrupt(struct pci_dev *dev)
u16 command, pmcsr;
u8 __iomem *csr;
u8 cmd_hi;
int pm;

switch (dev->device) {
/* PCI IDs taken from drivers/net/e100.c */
Expand Down Expand Up @@ -1870,9 +1869,8 @@ static void quirk_e100_interrupt(struct pci_dev *dev)
* Check that the device is in the D0 power state. If it's not,
* there is no point to look any further.
*/
pm = pci_find_capability(dev, PCI_CAP_ID_PM);
if (pm) {
pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
if (dev->pm_cap) {
pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0)
return;
}
Expand Down

0 comments on commit 728cdb7

Please sign in to comment.