summary refs log tree commit diff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-02 19:06:30 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-02 19:06:30 +0100
commit1fec16118ff9b822431d83a16430de60cf8e8769 (patch)
tree1c54f26f574388bd648bb83f0fbf8c581d392d90 /drivers/usb
parent031eda1840ffd819acbf2c0c1ea7d541d5d647ca (diff)
parent6f9f0eef0096caddc3fd92760f818970033f06ea (diff)
downloadlinux-1fec16118ff9b822431d83a16430de60cf8e8769.tar.gz
Merge branch 'pm-pci'
Merge PCI device power management updates for 5.16-rc1:

 - Make the association of ACPI device objects with PCI devices more
   straightforward and simplify the code doing that for all devices
   in general (Rafael Wysocki).

 - Eliminate struct pci_platform_pm_ops and handle the both of its
   users (PCI and Intel MID) directly in the PCI bus code (Rafael
   Wysocki).

 - Simplify and clarify ACPI PCI device PM helpers (Rafael Wysocki).

 - Fix ordering of operations in pci_back_from_sleep() (Rafael
   Wysocki).

* pm-pci:
  PCI: PM: Fix ordering of operations in pci_back_from_sleep()
  PCI: PM: Do not call platform_pci_power_manageable() unnecessarily
  PCI: PM: Make pci_choose_state() call pci_target_state()
  PCI: PM: Rearrange pci_target_state()
  PCI: PM: Simplify acpi_pci_power_manageable()
  PCI: PM: Drop struct pci_platform_pm_ops
  PCI: ACPI: PM: Do not use pci_platform_pm_ops for ACPI
  PCI: PM: Do not use pci_platform_pm_ops for Intel MID PM
  ACPI: glue: Look for ACPI bus type only if ACPI companion is not known
  ACPI: glue: Drop cleanup callback from struct acpi_bus_type
  PCI: ACPI: Drop acpi_pci_bus
Diffstat (limited to 'drivers/usb')
0 files changed, 0 insertions, 0 deletions