[v9,2/4] PM / EM: Declare EM data types unconditionally
diff mbox series

Message ID 20191030151451.7961-3-qperret@google.com
State New
Delegated to: Eduardo Valentin
Headers show
  • Make IPA use PM_EM
Related show

Commit Message

Quentin Perret Oct. 30, 2019, 3:14 p.m. UTC
The structs representing capacity states and performance domains of an
Energy Model are currently only defined for CONFIG_ENERGY_MODEL=y. That
makes it hard for code outside PM_EM to manipulate those structures
without a lot of ifdefery or stubbed accessors.

So, move the declaration of the two structs outside of the
CONFIG_ENERGY_MODEL ifdef. The client code (e.g. EAS or thermal) always
checks the return of em_cpu_get() before using it, so the exising code
is still safe to use as-is.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Quentin Perret <qperret@google.com>
 include/linux/energy_model.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff mbox series

diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
index 73f8c3cb9588..d249b88a4d5a 100644
--- a/include/linux/energy_model.h
+++ b/include/linux/energy_model.h
@@ -9,7 +9,6 @@ 
 #include <linux/sched/topology.h>
 #include <linux/types.h>
  * em_cap_state - Capacity state of a performance domain
  * @frequency:	The CPU frequency in KHz, for consistency with CPUFreq
@@ -40,6 +39,7 @@  struct em_perf_domain {
 	unsigned long cpus[0];
 struct em_data_callback {
@@ -160,7 +160,6 @@  static inline int em_pd_nr_cap_states(struct em_perf_domain *pd)
-struct em_perf_domain {};
 struct em_data_callback {};
 #define EM_DATA_CB(_active_power_cb) { }