platform/x86/intel/pmc: Remove duplicate enum

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@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@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@linux.intel.com>

diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c
index 05dec4f5019f3b19df42cc9c526d232ec91be27a..ad976cc83ecae90afa96bec18e59c146d566964c 100644 (file)
--- a/drivers/platform/x86/intel/pmc/arl.c
+++ b/drivers/platform/x86/intel/pmc/arl.c
@@ -693,7 +693,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 a1886d8e1ef3ee03bd8d2548f69a87bae5a7a275..a0f6cc427ddca90a2b4fbad3994f18b107ab12d7 100644 (file)
--- 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 be029f12cdf4031ba72b9904c6927ae4d8a8f8a3..09b13df90d685f1cc5c18f5ebd303c49ce825a8b 100644 (file)
--- a/drivers/platform/x86/intel/pmc/lnl.c
+++ b/drivers/platform/x86/intel/pmc/lnl.c
@@ -553,7 +553,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 02949fed76e916efe905bba926be4eee70029989..07687a3e436d5adf9f721519eabde30b1c320aa8 100644 (file)
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -992,7 +992,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;