[SRU][O:linux][PATCH 1/5] platform/x86/intel/pmc: Remove duplicate enum
Thibault Ferrante
thibault.ferrante at canonical.com
Wed Jun 4 16:27:30 UTC 2025
From: Xi Pardee <xi.pardee at linux.intel.com>
BugLink: https://bugs.launchpad.net/bugs/2112469
Remove duplicate enum PMC_IDX_SOC. PMC_IDX_SOC has the same value
as PMC_IDX_MAIN. Replace it with PMC_IDX_MAIN to avoid confusion.
Signed-off-by: Xi Pardee <xi.pardee at linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen at linux.intel.com>
Link: https://lore.kernel.org/r/20250207225615.401235-3-xi.pardee@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at linux.intel.com>
(cherry picked from commit 78eaf4d12d7c4ec6cf2f5ed8d8737ae0da390930)
Signed-off-by: Thibault Ferrante <thibault.ferrante at canonical.com>
---
drivers/platform/x86/intel/pmc/arl.c | 2 +-
drivers/platform/x86/intel/pmc/core.h | 1 -
drivers/platform/x86/intel/pmc/lnl.c | 2 +-
drivers/platform/x86/intel/pmc/mtl.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
index e10527c4e3e0..3e079db65229 100644
--- a/drivers/platform/x86/intel/pmc/arl.c
+++ b/drivers/platform/x86/intel/pmc/arl.c
@@ -694,7 +694,7 @@ static int arl_resume(struct pmc_dev *pmcdev)
int arl_core_init(struct pmc_dev *pmcdev)
{
- struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC];
+ struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
int ret;
int func = 0;
bool ssram_init = true;
diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
index e862ea88b816..beb212a6d71c 100644
--- a/drivers/platform/x86/intel/pmc/core.h
+++ b/drivers/platform/x86/intel/pmc/core.h
@@ -430,7 +430,6 @@ struct pmc_dev {
enum pmc_index {
PMC_IDX_MAIN,
- PMC_IDX_SOC = PMC_IDX_MAIN,
PMC_IDX_IOE,
PMC_IDX_PCH,
PMC_IDX_MAX
diff --git a/drivers/platform/x86/intel/pmc/lnl.c b/drivers/platform/x86/intel/pmc/lnl.c
index e7a8077d1a3e..d96d1772036e 100644
--- a/drivers/platform/x86/intel/pmc/lnl.c
+++ b/drivers/platform/x86/intel/pmc/lnl.c
@@ -554,7 +554,7 @@ static int lnl_resume(struct pmc_dev *pmcdev)
int lnl_core_init(struct pmc_dev *pmcdev)
{
int ret;
- struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC];
+ struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
lnl_d3_fixup();
diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index c7d15d864039..2066d0fe8a2f 100644
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -993,7 +993,7 @@ static int mtl_resume(struct pmc_dev *pmcdev)
int mtl_core_init(struct pmc_dev *pmcdev)
{
- struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC];
+ struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
int ret;
int func = 2;
bool ssram_init = true;
--
2.48.1
More information about the kernel-team
mailing list