From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 2 Nov 2021 18:06:30 +0000 (+0100)
Subject: Merge branch 'pm-pci'
X-Git-Tag: v6.1-rc5~2752^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fec16118ff9b822431d83a16430de60cf8e8769;p=platform%2Fkernel%2Flinux-starfive.git

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
---

1fec16118ff9b822431d83a16430de60cf8e8769