Merge branch 'pci/pm'
- Remove unused 'state' parameter to pci_legacy_suspend_late() (Bjorn Helgaas) * pci/pm: PCI/PM: Remove unused 'state' parameter to pci_legacy_suspend_late()
This commit is contained in:
commit
e1f2d15397
|
@ -646,7 +646,7 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
|
||||
static int pci_legacy_suspend_late(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||
|
||||
|
@ -848,7 +848,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
|
|||
return 0;
|
||||
|
||||
if (pci_has_legacy_pm_support(pci_dev))
|
||||
return pci_legacy_suspend_late(dev, PMSG_SUSPEND);
|
||||
return pci_legacy_suspend_late(dev);
|
||||
|
||||
if (!pm) {
|
||||
pci_save_state(pci_dev);
|
||||
|
@ -1060,7 +1060,7 @@ static int pci_pm_freeze_noirq(struct device *dev)
|
|||
const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
|
||||
|
||||
if (pci_has_legacy_pm_support(pci_dev))
|
||||
return pci_legacy_suspend_late(dev, PMSG_FREEZE);
|
||||
return pci_legacy_suspend_late(dev);
|
||||
|
||||
if (pm && pm->freeze_noirq) {
|
||||
int error;
|
||||
|
@ -1179,7 +1179,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
|
|||
return 0;
|
||||
|
||||
if (pci_has_legacy_pm_support(pci_dev))
|
||||
return pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
|
||||
return pci_legacy_suspend_late(dev);
|
||||
|
||||
if (!pm) {
|
||||
pci_fixup_device(pci_fixup_suspend_late, pci_dev);
|
||||
|
|
Loading…
Reference in New Issue