Commit 6b9a3aa3 authored by Zhang Rui's avatar Zhang Rui Committed by Xiaolong Wang
Browse files

powercap: intel_rapl: Remove unused field in struct rapl_if_priv 

mainline inclusion
from mainline-v6.5-rc1
commit 31cb1304
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I92135

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=31cb1304ad8bd27b7d2abd8669fb887fb47d8eaf



--------------------------------

After commit f1e8d756 ("powercap/intel_rapl: enumerate Psys RAPL
domain together with package RAPL domain"), the platform_rapl_domain field
is not used anymore. Remove it from rapl_if_priv structure.

Intel-SIG: commit 31cb1304 powercap: intel_rapl: Remove unused field in struct rapl_if_priv
Backport Intel RAPL driver support on TPMI.

Fixes: f1e8d756 ("powercap/intel_rapl: enumerate Psys RAPL domain together with package RAPL domain")
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Xiaolong Wang: amend commit log ]
Signed-off-by: default avatarXiaolong Wang <xiaolong.wang@intel.com>
parent a93c31a2

include/linux/intel_rapl.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ struct reg_action { 
 */

struct rapl_if_priv {

	struct powercap_control_type *control_type;

	struct rapl_domain *platform_rapl_domain;

	enum cpuhp_state pcap_rapl_online;

	u64 reg_unit;

	u64 regs[RAPL_DOMAIN_MAX][RAPL_DOMAIN_REG_MAX];