From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 30 Oct 2022 14:19:22 +0000 (+0100)
Subject: 6.0-stable patches
X-Git-Tag: v4.19.263~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb46be91e3eafd5135694c1633722a56431fd781;p=thirdparty%2Fkernel%2Fstable-queue.git

6.0-stable patches

added patches:
	platform-x86-amd-pmc-remove-config_debug_fs-checks.patch
---

diff --git a/queue-6.0/platform-x86-amd-pmc-remove-config_debug_fs-checks.patch b/queue-6.0/platform-x86-amd-pmc-remove-config_debug_fs-checks.patch
new file mode 100644
index 00000000000..f8acfa9bff7
--- /dev/null
+++ b/queue-6.0/platform-x86-amd-pmc-remove-config_debug_fs-checks.patch
@@ -0,0 +1,59 @@
+From b37fe34c83099ba5105115f8287c5546af1f0a05 Mon Sep 17 00:00:00 2001
+From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Date: Thu, 22 Sep 2022 23:26:08 +0530
+Subject: platform/x86/amd: pmc: remove CONFIG_DEBUG_FS checks
+
+From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+
+commit b37fe34c83099ba5105115f8287c5546af1f0a05 upstream.
+
+Since linux/debugfs.h already has the stubs for the used debugfs
+functions when debugfs is not enabled, remove the #ifdef CONFIG_DEBUG_FS
+checks.
+
+Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Link: https://lore.kernel.org/r/20220922175608.630046-1-Shyam-sundar.S-k@amd.com
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Cc: Jaak Ristioja <jaak@ristioja.ee>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/platform/x86/amd/pmc.c |   12 ------------
+ 1 file changed, 12 deletions(-)
+
+--- 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(str
+ }
+ #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(struc
+ 					    &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)
+ {
diff --git a/queue-6.0/series b/queue-6.0/series
new file mode 100644
index 00000000000..c7496345ef7
--- /dev/null
+++ b/queue-6.0/series
@@ -0,0 +1 @@
+platform-x86-amd-pmc-remove-config_debug_fs-checks.patch