Merge branch 'pci/pm'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 21 Oct 2020 14:58:35 +0000 (09:58 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 21 Oct 2020 14:58:35 +0000 (09:58 -0500)
commit0d2493ab08b4cb6a8fc3e07a8e5667ac077f2e1a
treecef360b1e6f249767ca5070e78107decbfb37d45
parent5cfdc750bc6fc5ca38a04e986125641aea7d66c3
parent638c133e5f52a3793cb5494897df008f5cef0ddd
Merge branch 'pci/pm'

- Remove unused pcibios_pm_ops (Vaibhav Gupta)

- Rename pci_dev.d3_delay to d3hot_delay (Krzysztof WilczyƄski)

- Apply D2 transition delay as microseconds, not milliseconds (Bjorn
  Helgaas)

* pci/pm:
  PCI/PM: Revert "PCI/PM: Apply D2 delay as milliseconds, not microseconds"
  PCI/PM: Remove unused PCI_PM_BUS_WAIT
  PCI/PM: Rename pci_dev.d3_delay to d3hot_delay
  PCI/PM: Remove unused pcibios_pm_ops
drivers/pci/pci.c
drivers/pci/quirks.c
include/linux/pci.h
include/uapi/linux/pci_regs.h