From: Xi Pardee Date: Fri, 7 Feb 2025 22:56:08 +0000 (-0800) Subject: platform/x86/intel/pmc: Remove duplicate enum X-Git-Tag: io_uring-6.15-20250403~94^2~49 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=78eaf4d12d7c4ec6cf2f5ed8d8737ae0da390930;p=linux-block.git 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 Reviewed-by: Ilpo Järvinen Link: https://lore.kernel.org/r/20250207225615.401235-3-xi.pardee@linux.intel.com Signed-off-by: Ilpo Järvinen --- diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c index 05dec4f5019f..ad976cc83eca 100644 --- 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 a1886d8e1ef3..a0f6cc427ddc 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 be029f12cdf4..09b13df90d68 100644 --- 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 02949fed76e9..07687a3e436d 100644 --- 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;