Merge branch 'pci/enumeration'
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 23 Sep 2019 21:10:08 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 23 Sep 2019 21:10:08 +0000 (16:10 -0500)
commita10a1f60c7a35f59bee803fe2796ec5172e73edb
tree6924849cd9fa8e69c08a8f31dfabb025232a229b
parent77dc51fd557f871278129d96f58e14fb4b8a8002
parentca78410403dd64ac0ee0e3cc8646b38335271bfd
Merge branch 'pci/enumeration'

  - Consolidate _HPP & _HPX code in pci-acpi.h and remove unnecessary
    struct hotplug_program_ops (Krzysztof Wilczynski)

  - Fixup PCIe device types to remove the need for dev->has_secondary_link
    (Mika Westerberg)

* pci/enumeration:
  PCI: Get rid of dev->has_secondary_link flag
  PCI: Make pcie_downstream_port() available outside of access.c
  PCI/ACPI: Remove unnecessary struct hotplug_program_ops
  PCI/ACPI: Move _HPP & _HPX functions to pci-acpi.c
  PCI/ACPI: Rename _HPX structs from hpp_* to hpx_*
drivers/pci/pci-acpi.c
drivers/pci/pci.h
drivers/pci/pcie/aspm.c
include/linux/pci.h