Merge branch 'pci/pm'

Browse source

- Add sysfs attribute for device power state (Maximilian Luz)

- Rename pci_wakeup_bus() to pci_resume_bus() (Mika Westerberg)

- Do not generate wakeup event when runtime resuming bus (Mika Westerberg)

* pci/pm:
  PCI/PM: Do not generate wakeup event when runtime resuming device
  PCI/PM: Rename pci_wakeup_bus() to pci_resume_bus()
  PCI: Add sysfs attribute for device power state

...

This commit is contained in:

Bjorn Helgaas 2020-12-15 15:11:08 -06:00

parent a48e486b37 9c2cc571f9

commit ff163da95b

5 changed files with 26 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

Documentation/ABI/testing/sysfs-bus-pci

View file

2

drivers/gpu/vga/vga_switcheroo.c

View file

10

drivers/pci/pci-sysfs.c

View file

16

drivers/pci/pci.c

View file

2

include/linux/pci.h

View file