Skip to content

Commit

Permalink
platform/x86/intel/pmc: Remove duplicate enum
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Xi Pardee authored and Ilpo Järvinen committed Feb 10, 2025
1 parent db7155b commit 78eaf4d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel/pmc/arl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/platform/x86/intel/pmc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel/pmc/lnl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel/pmc/mtl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 78eaf4d

Please sign in to comment.