commit b37fe34c83099ba5105115f8287c5546af1f0a05 upstream.
This fixes a compilation bug introduced in commit e9847175b266f12365160e124a207907da3dbe8e (platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems).
Signed-off-by: Nils Freydank nils.freydank@posteo.de ---
Backport patch applies and compiles with linux 6.0.6. Feel free to use the whole patch or any parts of it at your discretion.
drivers/platform/x86/amd/pmc.c | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/drivers/platform/x86/amd/pmc.c b/drivers/platform/x86/amd/pmc.c index fc326fdf4..6ccb9b384 100644 --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -151,9 +151,7 @@ struct amd_pmc_dev { struct device *dev; struct pci_dev *rdev; struct mutex lock; /* generic mutex lock */ -#if IS_ENABLED(CONFIG_DEBUG_FS) struct dentry *dbgfs_dir; -#endif /* CONFIG_DEBUG_FS */ };
static bool enable_stb; @@ -369,7 +367,6 @@ static void amd_pmc_validate_deepest(struct amd_pmc_dev *pdev) } #endif
-#ifdef CONFIG_DEBUG_FS static int smu_fw_info_show(struct seq_file *s, void *unused) { struct amd_pmc_dev *dev = s->private; @@ -504,15 +501,6 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) &amd_pmc_stb_debugfs_fops); } } -#else -static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev) -{ -} - -static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev) -{ -} -#endif /* CONFIG_DEBUG_FS */
static void amd_pmc_dump_registers(struct amd_pmc_dev *dev) {