This is a note to let you know that I've just added the patch titled platform/x86/amd: pmc: Remove more CONFIG_DEBUG_FS checks to the 6.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: platform-x86-amd-pmc-remove-more-config_debug_fs-checks.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From a5b5fb0fc47ddc7d1ed6a0365197639a01bc1f3a Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello@xxxxxxx> Date: Mon, 7 Nov 2022 20:33:23 -0600 Subject: platform/x86/amd: pmc: Remove more CONFIG_DEBUG_FS checks From: Mario Limonciello <mario.limonciello@xxxxxxx> commit a5b5fb0fc47ddc7d1ed6a0365197639a01bc1f3a upstream. commit b37fe34c8309 ("platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks") removed most CONFIG_DEBUG_FS checks, but there were some left that were reported to cause compile test failures. Remove the remaining checks, and also the unnecessary CONFIG_SUSPEND used in the same place. Reported-by: liyupeng@xxxxxxxxxx Fixes: b37fe34c8309 ("platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks") Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216679 Link: https://lore.kernel.org/r/20221108023323.19304-1-mario.limonciello@xxxxxxx Cc: stable@xxxxxxxxxxxxxxx Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/platform/x86/amd/pmc.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/platform/x86/amd/pmc.c +++ b/drivers/platform/x86/amd/pmc.c @@ -274,7 +274,6 @@ static const struct file_operations amd_ .release = amd_pmc_stb_debugfs_release_v2, }; -#if defined(CONFIG_SUSPEND) || defined(CONFIG_DEBUG_FS) static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev) { if (dev->cpu_id == AMD_CPU_ID_PCO) { @@ -349,7 +348,6 @@ static int get_metrics_table(struct amd_ memcpy_fromio(table, pdev->smu_virt_addr, sizeof(struct smu_metrics)); return 0; } -#endif /* CONFIG_SUSPEND || CONFIG_DEBUG_FS */ #ifdef CONFIG_SUSPEND static void amd_pmc_validate_deepest(struct amd_pmc_dev *pdev) Patches currently in stable-queue which might be from mario.limonciello@xxxxxxx are queue-6.0/drm-amd-fail-the-suspend-if-resources-can-t-be-evict.patch queue-6.0/platform-x86-amd-pmc-add-new-acpi-id-amdi0009.patch queue-6.0/asoc-amd-yc-adding-lenovo-thinkbook-14-gen-4-ara-and.patch queue-6.0/platform-x86-amd-pmc-remove-more-config_debug_fs-checks.patch queue-6.0/acpi-x86-add-another-system-to-quirk-list-for-forcin.patch