platform/x86: intel_pmc_core: Relocate pmc_core_*_display() to outside of CONFIG_DEBUG_FS

Since pmc_core_slps0_display() and pmc_core_lpm_display() is responsible for
dumping as well as displaying debug registers, there is no need for these
two functions to be defined under CONFIG_DEBUG_FS.

Hence, relocate these functions from under CONFIG_DEBUG_FS to above the block.

Cc: Chen Zhou <chenzhou10@huawei.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: David E. Box <david.e.box@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index f4a36fb..20b2f49 100644 (file)
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -612,6 +612,67 @@ static int pmc_core_check_read_lock_bit(void)
        return value & BIT(pmcdev->map->pm_read_disable_bit);
 }
 
+static void pmc_core_slps0_display(struct pmc_dev *pmcdev, struct device *dev,
+                                  struct seq_file *s)
+{
+       const struct pmc_bit_map **maps = pmcdev->map->slps0_dbg_maps;
+       const struct pmc_bit_map *map;
+       int offset = pmcdev->map->slps0_dbg_offset;
+       u32 data;
+
+       while (*maps) {
+               map = *maps;
+               data = pmc_core_reg_read(pmcdev, offset);
+               offset += 4;
+               while (map->name) {
+                       if (dev)
+                               dev_dbg(dev, "SLP_S0_DBG: %-32s\tState: %s\n",
+                                       map->name,
+                                       data & map->bit_mask ? "Yes" : "No");
+                       if (s)
+                               seq_printf(s, "SLP_S0_DBG: %-32s\tState: %s\n",
+                                          map->name,
+                                          data & map->bit_mask ? "Yes" : "No");
+                       ++map;
+               }
+               ++maps;
+       }
+}
+
+static void pmc_core_lpm_display(struct pmc_dev *pmcdev, struct device *dev,
+                                struct seq_file *s, u32 offset,
+                                const char *str,
+                                const struct pmc_bit_map **maps)
+{
+       u32 lpm_regs[ARRAY_SIZE(tgl_lpm_maps)-1];
+       int index, idx, len = 32, bit_mask;
+
+       for (index = 0; tgl_lpm_maps[index]; index++) {
+               lpm_regs[index] = pmc_core_reg_read(pmcdev, offset);
+               offset += 4;
+       }
+
+       for (idx = 0; maps[idx]; idx++) {
+               if (dev)
+                       dev_dbg(dev, "\nLPM_%s_%d:\t0x%x\n", str, idx,
+                               lpm_regs[idx]);
+               if (s)
+                       seq_printf(s, "\nLPM_%s_%d:\t0x%x\n", str, idx,
+                                  lpm_regs[idx]);
+               for (index = 0; maps[idx][index].name && index < len; index++) {
+                       bit_mask = maps[idx][index].bit_mask;
+                       if (dev)
+                               dev_dbg(dev, "%-30s %-30d\n",
+                                       maps[idx][index].name,
+                                       lpm_regs[idx] & bit_mask ? 1 : 0);
+                       if (s)
+                               seq_printf(s, "%-30s %-30d\n",
+                                          maps[idx][index].name,
+                                          lpm_regs[idx] & bit_mask ? 1 : 0);
+               }
+       }
+}
+
 #if IS_ENABLED(CONFIG_DEBUG_FS)
 static bool slps0_dbg_latch;
 
@@ -844,33 +905,6 @@ out_unlock:
        mutex_unlock(&pmcdev->lock);
 }
 
-static void pmc_core_slps0_display(struct pmc_dev *pmcdev, struct device *dev,
-                                  struct seq_file *s)
-{
-       const struct pmc_bit_map **maps = pmcdev->map->slps0_dbg_maps;
-       const struct pmc_bit_map *map;
-       int offset = pmcdev->map->slps0_dbg_offset;
-       u32 data;
-
-       while (*maps) {
-               map = *maps;
-               data = pmc_core_reg_read(pmcdev, offset);
-               offset += 4;
-               while (map->name) {
-                       if (dev)
-                               dev_dbg(dev, "SLP_S0_DBG: %-32s\tState: %s\n",
-                                       map->name,
-                                       data & map->bit_mask ? "Yes" : "No");
-                       if (s)
-                               seq_printf(s, "SLP_S0_DBG: %-32s\tState: %s\n",
-                                          map->name,
-                                          data & map->bit_mask ? "Yes" : "No");
-                       ++map;
-               }
-               ++maps;
-       }
-}
-
 static int pmc_core_slps0_dbg_show(struct seq_file *s, void *unused)
 {
        struct pmc_dev *pmcdev = s->private;
@@ -974,40 +1008,6 @@ static int pmc_core_substate_res_show(struct seq_file *s, void *unused)
 }
 DEFINE_SHOW_ATTRIBUTE(pmc_core_substate_res);
 
-static void pmc_core_lpm_display(struct pmc_dev *pmcdev, struct device *dev,
-                                struct seq_file *s, u32 offset,
-                                const char *str,
-                                const struct pmc_bit_map **maps)
-{
-       u32 lpm_regs[ARRAY_SIZE(tgl_lpm_maps)-1];
-       int index, idx, len = 32, bit_mask;
-
-       for (index = 0; tgl_lpm_maps[index]; index++) {
-               lpm_regs[index] = pmc_core_reg_read(pmcdev, offset);
-               offset += 4;
-       }
-
-       for (idx = 0; maps[idx]; idx++) {
-               if (dev)
-                       dev_dbg(dev, "\nLPM_%s_%d:\t0x%x\n", str, idx,
-                               lpm_regs[idx]);
-               if (s)
-                       seq_printf(s, "\nLPM_%s_%d:\t0x%x\n", str, idx,
-                                  lpm_regs[idx]);
-               for (index = 0; maps[idx][index].name && index < len; index++) {
-                       bit_mask = maps[idx][index].bit_mask;
-                       if (dev)
-                               dev_dbg(dev, "%-30s %-30d\n",
-                                       maps[idx][index].name,
-                                       lpm_regs[idx] & bit_mask ? 1 : 0);
-                       if (s)
-                               seq_printf(s, "%-30s %-30d\n",
-                                          maps[idx][index].name,
-                                          lpm_regs[idx] & bit_mask ? 1 : 0);
-               }
-       }
-}
-
 static int pmc_core_substate_sts_regs_show(struct seq_file *s, void *unused)
 {
        struct pmc_dev *pmcdev = s->private;