mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
PM / core: Drop run_wake flag from struct dev_pm_info
The run_wake flag in struct dev_pm_info is used to indicate whether or not the device is capable of generating remote wakeup signals at run time (or in the system working state), but the distinction between runtime remote wakeup and system wakeup signaling has always been rather artificial. The only practical reason for it to exist at the core level was that ACPI and PCI treated those two cases differently, but that's not the case any more after recent changes. For this reason, get rid of the run_wake flag and, when applicable, use device_set_wakeup_capable() and device_can_wakeup() instead of device_set_run_wake() and device_run_wake(), respectively. Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Mika Westerberg <[email protected]> Acked-by: Bjorn Helgaas <[email protected]>
This commit is contained in:
parent
0847684cfc
commit
de3ef1eb1c
9 changed files with 11 additions and 32 deletions
|
|
@ -230,7 +230,6 @@ static int dwc3_pci_probe(struct pci_dev *pci,
|
|||
}
|
||||
|
||||
device_init_wakeup(dev, true);
|
||||
device_set_run_wake(dev, true);
|
||||
pci_set_drvdata(pci, dwc);
|
||||
pm_runtime_put(dev);
|
||||
|
||||
|
|
@ -310,7 +309,7 @@ static int dwc3_pci_runtime_suspend(struct device *dev)
|
|||
{
|
||||
struct dwc3_pci *dwc = dev_get_drvdata(dev);
|
||||
|
||||
if (device_run_wake(dev))
|
||||
if (device_can_wakeup(dev))
|
||||
return dwc3_pci_dsm(dwc, PCI_INTEL_BXT_STATE_D3);
|
||||
|
||||
return -EBUSY;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ static int uhci_pci_init(struct usb_hcd *hcd)
|
|||
|
||||
/* Intel controllers use non-PME wakeup signalling */
|
||||
if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_INTEL)
|
||||
device_set_run_wake(uhci_dev(uhci), 1);
|
||||
device_set_wakeup_capable(uhci_dev(uhci), true);
|
||||
|
||||
/* Set up pointers to PCI-specific functions */
|
||||
uhci->reset_hc = uhci_pci_reset_hc;
|
||||
|
|
|
|||
Loading…
Reference in a new issue