|
@@ -580,14 +580,14 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)
|
|
{
|
|
{
|
|
pci_fixup_device(pci_fixup_resume, pci_dev);
|
|
pci_fixup_device(pci_fixup_resume, pci_dev);
|
|
|
|
|
|
- if (!pci_is_bridge(pci_dev))
|
|
|
|
|
|
+ if (!pci_has_subordinate(pci_dev))
|
|
pci_enable_wake(pci_dev, PCI_D0, false);
|
|
pci_enable_wake(pci_dev, PCI_D0, false);
|
|
}
|
|
}
|
|
|
|
|
|
static void pci_pm_default_suspend(struct pci_dev *pci_dev)
|
|
static void pci_pm_default_suspend(struct pci_dev *pci_dev)
|
|
{
|
|
{
|
|
/* Disable non-bridge devices without PM support */
|
|
/* Disable non-bridge devices without PM support */
|
|
- if (!pci_is_bridge(pci_dev))
|
|
|
|
|
|
+ if (!pci_has_subordinate(pci_dev))
|
|
pci_disable_enabled_device(pci_dev);
|
|
pci_disable_enabled_device(pci_dev);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -717,7 +717,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
|
|
|
|
|
|
if (!pci_dev->state_saved) {
|
|
if (!pci_dev->state_saved) {
|
|
pci_save_state(pci_dev);
|
|
pci_save_state(pci_dev);
|
|
- if (!pci_is_bridge(pci_dev))
|
|
|
|
|
|
+ if (!pci_has_subordinate(pci_dev))
|
|
pci_prepare_to_sleep(pci_dev);
|
|
pci_prepare_to_sleep(pci_dev);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -971,7 +971,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
|
|
|
|
|
|
+ if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev))
|
|
pci_prepare_to_sleep(pci_dev);
|
|
pci_prepare_to_sleep(pci_dev);
|
|
|
|
|
|
/*
|
|
/*
|