diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 17:58:35 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 17:58:35 +0300 |
| commit | 0d2493ab08b4cb6a8fc3e07a8e5667ac077f2e1a (patch) | |
| tree | cef360b1e6f249767ca5070e78107decbfb37d45 /include | |
| parent | 5cfdc750bc6fc5ca38a04e986125641aea7d66c3 (diff) | |
| parent | 638c133e5f52a3793cb5494897df008f5cef0ddd (diff) | |
| download | linux-0d2493ab08b4cb6a8fc3e07a8e5667ac077f2e1a.tar.xz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c5288cd71a2e..bc529610b5f4 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -373,7 +373,7 @@ struct pci_dev { user sysfs */ unsigned int clear_retrain_link:1; /* Need to clear Retrain Link bit manually */ - unsigned int d3_delay; /* D3->D0 transition time in ms */ + unsigned int d3hot_delay; /* D3hot->D0 transition time in ms */ unsigned int d3cold_delay; /* D3cold->D0 transition time in ms */ #ifdef CONFIG_PCIEASPM @@ -2035,10 +2035,6 @@ int pcibios_alloc_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev); resource_size_t pcibios_default_alignment(void); -#ifdef CONFIG_HIBERNATE_CALLBACKS -extern struct dev_pm_ops pcibios_pm_ops; -#endif - #if defined(CONFIG_PCI_MMCONFIG) || defined(CONFIG_ACPI_MCFG) void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_late_init(void); diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index c7e0acba0e20..be85b54b3854 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -246,7 +246,7 @@ #define PCI_PM_CAP_PME_D0 0x0800 /* PME# from D0 */ #define PCI_PM_CAP_PME_D1 0x1000 /* PME# from D1 */ #define PCI_PM_CAP_PME_D2 0x2000 /* PME# from D2 */ -#define PCI_PM_CAP_PME_D3 0x4000 /* PME# from D3 (hot) */ +#define PCI_PM_CAP_PME_D3hot 0x4000 /* PME# from D3 (hot) */ #define PCI_PM_CAP_PME_D3cold 0x8000 /* PME# from D3 (cold) */ #define PCI_PM_CAP_PME_SHIFT 11 /* Start of the PME Mask in PMC */ #define PCI_PM_CTRL 4 /* PM control and status register */ |