cpufreq: amd-pstate: remove global header file

When extra warnings are enabled, gcc points out a global variable
definition in a header:

In file included from drivers/cpufreq/amd-pstate-ut.c:29:
include/linux/amd-pstate.h:123:27: error: 'amd_pstate_mode_string' defined but not used [-Werror=unused-const-variable=]
  123 | static const char * const amd_pstate_mode_string[] = {
      |                           ^~~~~~~~~~~~~~~~~~~~~~

This header is only included from two files in the same directory,
and one of them uses only a single definition from it, so clean it
up by moving most of the contents into the driver that uses them,
and making shared bits a local header file.

Fixes: 36c5014e5460 ("cpufreq: amd-pstate: optimize driver working mode selection in amd_pstate_param()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index d6c90161c7bfe3886e675396cb2d2d7b44acc3b3..fc31870379f84ec07620f6390bafb46661443791 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1107,7 +1107,6 @@ L:        linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/admin-guide/pm/amd-pstate.rst
 F:     drivers/cpufreq/amd-pstate*
-F:     include/linux/amd-pstate.h
 F:     tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
 
 AMD PTDMA DRIVER

diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
index f04ae67dda372d2787bba3bb45d57f53515e2bc0..fc275d41d51e9b51a93ccc26f36e5592c4228d60 100644 (file)
--- a/drivers/cpufreq/amd-pstate-ut.c
+++ b/drivers/cpufreq/amd-pstate-ut.c
@@ -26,10 +26,11 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/fs.h>
-#include <linux/amd-pstate.h>
 
 #include <acpi/cppc_acpi.h>
 
+#include "amd-pstate.h"
+
 /*
  * Abbreviations:
  * amd_pstate_ut: used as a shortform for AMD P-State unit test.

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 1b7e82a0ad2e62f4e0f3e520bfa9408888bc4434..91993647e09ef8f0f6a3f5b5b45d4622ee2ce002 100644 (file)
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -36,7 +36,6 @@
 #include <linux/delay.h>
 #include <linux/uaccess.h>
 #include <linux/static_call.h>
-#include <linux/amd-pstate.h>
 #include <linux/topology.h>
 
 #include <acpi/processor.h>
@@ -46,6 +45,8 @@
 #include <asm/processor.h>
 #include <asm/cpufeature.h>
 #include <asm/cpu_device_id.h>
+
+#include "amd-pstate.h"
 #include "amd-pstate-trace.h"
 
 #define AMD_PSTATE_TRANSITION_LATENCY  20000
@@ -53,6 +54,37 @@
 #define CPPC_HIGHEST_PERF_PERFORMANCE  196
 #define CPPC_HIGHEST_PERF_DEFAULT      166
 
+#define AMD_CPPC_EPP_PERFORMANCE               0x00
+#define AMD_CPPC_EPP_BALANCE_PERFORMANCE       0x80
+#define AMD_CPPC_EPP_BALANCE_POWERSAVE         0xBF
+#define AMD_CPPC_EPP_POWERSAVE                 0xFF
+
+/*
+ * enum amd_pstate_mode - driver working mode of amd pstate
+ */
+enum amd_pstate_mode {
+       AMD_PSTATE_UNDEFINED = 0,
+       AMD_PSTATE_DISABLE,
+       AMD_PSTATE_PASSIVE,
+       AMD_PSTATE_ACTIVE,
+       AMD_PSTATE_GUIDED,
+       AMD_PSTATE_MAX,
+};
+
+static const char * const amd_pstate_mode_string[] = {
+       [AMD_PSTATE_UNDEFINED]   = "undefined",
+       [AMD_PSTATE_DISABLE]     = "disable",
+       [AMD_PSTATE_PASSIVE]     = "passive",
+       [AMD_PSTATE_ACTIVE]      = "active",
+       [AMD_PSTATE_GUIDED]      = "guided",
+       NULL,
+};
+
+struct quirk_entry {
+       u32 nominal_freq;
+       u32 lowest_freq;
+};
+
 /*
  * TODO: We need more time to fine tune processors with shared memory solution
  * with community together.

diff --git a/include/linux/amd-pstate.h b/drivers/cpufreq/amd-pstate.h
similarity index 82%
rename from include/linux/amd-pstate.h
rename to drivers/cpufreq/amd-pstate.h
index d58fc022ec466e2041c081a14783844daadbb84c..e6a28e7f4dbf12a5ef4a86e2f966c2b454fc420f 100644 (file)
--- a/include/linux/amd-pstate.h
+++ b/drivers/cpufreq/amd-pstate.h
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * linux/include/linux/amd-pstate.h
- *
  * Copyright (C) 2022 Advanced Micro Devices, Inc.
  *
  * Author: Meng Li <li.meng@amd.com>
@@ -12,11 +10,6 @@
 
 #include <linux/pm_qos.h>
 
-#define AMD_CPPC_EPP_PERFORMANCE               0x00
-#define AMD_CPPC_EPP_BALANCE_PERFORMANCE       0x80
-#define AMD_CPPC_EPP_BALANCE_POWERSAVE         0xBF
-#define AMD_CPPC_EPP_POWERSAVE                 0xFF
-
 /*********************************************************************
  *                        AMD P-state INTERFACE                       *
  *********************************************************************/
@@ -108,30 +101,4 @@ struct amd_cpudata {
        bool    suspended;
 };
 
-/*
- * enum amd_pstate_mode - driver working mode of amd pstate
- */
-enum amd_pstate_mode {
-       AMD_PSTATE_UNDEFINED = 0,
-       AMD_PSTATE_DISABLE,
-       AMD_PSTATE_PASSIVE,
-       AMD_PSTATE_ACTIVE,
-       AMD_PSTATE_GUIDED,
-       AMD_PSTATE_MAX,
-};
-
-static const char * const amd_pstate_mode_string[] = {
-       [AMD_PSTATE_UNDEFINED]   = "undefined",
-       [AMD_PSTATE_DISABLE]     = "disable",
-       [AMD_PSTATE_PASSIVE]     = "passive",
-       [AMD_PSTATE_ACTIVE]      = "active",
-       [AMD_PSTATE_GUIDED]      = "guided",
-       NULL,
-};
-
-struct quirk_entry {
-       u32 nominal_freq;
-       u32 lowest_freq;
-};
-
 #endif /* _LINUX_AMD_PSTATE_H */