[J/K/Unstable/OEM-5.17/OEM-6.0] [PATCH 08/10] UBUNTU: SAUCE: PCI/PTM: Consolidate PTM interface declarations
Kai-Heng Feng
kai.heng.feng at canonical.com
Thu Sep 15 12:09:30 UTC 2022
From: Bjorn Helgaas <bhelgaas at google.com>
BugLink: https://bugs.launchpad.net/bugs/1988797
Consolidate all the PTM-related declarations in drivers/pci/pci.h. No
functional change intended.
Link: https://lore.kernel.org/r/20220909202505.314195-9-helgaas@kernel.org
Tested-by: Rajvi Jingar <rajvi.jingar at linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas at google.com>
Reviewed-by: Mika Westerberg <mika.westerberg at linux.intel.com>
(cherry picked from commit d736d292bba2c5225cb76cd4e04d0e9d00f22498 git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/pm)
Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
drivers/pci/pci.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index ce4a277e3f41f..5cca2e58cce8a 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -505,11 +505,13 @@ static inline int pci_iov_bus_range(struct pci_bus *bus)
#endif /* CONFIG_PCI_IOV */
#ifdef CONFIG_PCIE_PTM
+void pci_ptm_init(struct pci_dev *dev);
void pci_save_ptm_state(struct pci_dev *dev);
void pci_restore_ptm_state(struct pci_dev *dev);
void pci_suspend_ptm(struct pci_dev *dev);
void pci_resume_ptm(struct pci_dev *dev);
#else
+static inline void pci_ptm_init(struct pci_dev *dev) { }
static inline void pci_save_ptm_state(struct pci_dev *dev) { }
static inline void pci_restore_ptm_state(struct pci_dev *dev) { }
static inline void pci_suspend_ptm(struct pci_dev *dev) { }
@@ -577,12 +579,6 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev) { }
static inline void pcie_ecrc_get_policy(char *str) { }
#endif
-#ifdef CONFIG_PCIE_PTM
-void pci_ptm_init(struct pci_dev *dev);
-#else
-static inline void pci_ptm_init(struct pci_dev *dev) { }
-#endif
-
struct pci_dev_reset_methods {
u16 vendor;
u16 device;
--
2.37.2
More information about the kernel-team
mailing list