Re: [PATCH v4 2/6] platform/x86/intel/pmc: Remove duplicate enum

[Ilpo Järvinen]

On Thu, 9 Jan 2025, Xi Pardee wrote:

> 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@xxxxxxxxxxxxxxx>

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>

-- 
 i.

> ---
>  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 05dec4f5019f3..ad976cc83ecae 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 a1886d8e1ef3e..a0f6cc427ddca 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 be029f12cdf40..09b13df90d685 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 02949fed76e91..07687a3e436d5 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;
>