diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:21 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:43:21 -0500 |
| commit | 3f4f35678fb83da2f9ef17ddaa7507a45c2f7049 (patch) | |
| tree | bf73ab51e0e7a9847e94fbcae1323c83aa81ed7c /drivers/pci/pci.h | |
| parent | 6c6cba49495c3a254c1bc922afeb69e1431d2c23 (diff) | |
| parent | a0d2a959d3da343554523d26902de1d40a9e5c28 (diff) | |
| download | linux-3f4f35678fb83da2f9ef17ddaa7507a45c2f7049.tar.gz linux-3f4f35678fb83da2f9ef17ddaa7507a45c2f7049.tar.bz2 linux-3f4f35678fb83da2f9ef17ddaa7507a45c2f7049.zip | |
Merge branch 'pci/pm' into next
* pci/pm:
PCI: Avoid unnecessary resume after direct-complete
PCI: Recognize D3cold in pci_update_current_state()
PCI: Query platform firmware for device power state
PCI: Afford direct-complete to devices with non-standard PM
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 194521bfb1a3..451856210e18 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -42,6 +42,8 @@ int pci_probe_reset_function(struct pci_dev *dev); * * @set_state: invokes the platform firmware to set the device's power state * + * @get_state: queries the platform firmware for a device's current power state + * * @choose_state: returns PCI power state of given device preferred by the * platform; to be used during system-wide transitions from a * sleeping state to the working state and vice versa @@ -62,6 +64,7 @@ int pci_probe_reset_function(struct pci_dev *dev); struct pci_platform_pm_ops { bool (*is_manageable)(struct pci_dev *dev); int (*set_state)(struct pci_dev *dev, pci_power_t state); + pci_power_t (*get_state)(struct pci_dev *dev); pci_power_t (*choose_state)(struct pci_dev *dev); int (*sleep_wake)(struct pci_dev *dev, bool enable); int (*run_wake)(struct pci_dev *dev, bool enable); |