From: Xi Pardee <xi.pardee@linux.intel.com>
To: xi.pardee@linux.intel.com, rajvi0912@gmail.com,
irenic.rajneesh@gmail.com, david.e.box@linux.intel.com,
hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v4 2/6] platform/x86/intel/pmc: Remove duplicate enum
Date: Thu, 9 Jan 2025 16:26:04 -0800 [thread overview]
Message-ID: <20250110002612.244782-3-xi.pardee@linux.intel.com> (raw)
In-Reply-To: <20250110002612.244782-1-xi.pardee@linux.intel.com>
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>
---
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;
--
2.43.0
next prev parent reply other threads:[~2025-01-10 0:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-10 0:26 [PATCH v4 0/6] Add Arrow Lake U/H support Xi Pardee
2025-01-10 0:26 ` [PATCH v4 1/6] platform/x86:intel/pmc: Make tgl_core_generic_init() static Xi Pardee
2025-01-10 0:26 ` Xi Pardee [this message]
2025-01-10 11:30 ` [PATCH v4 2/6] platform/x86/intel/pmc: Remove duplicate enum Ilpo Järvinen
2025-01-10 0:26 ` [PATCH v4 3/6] platform/x86:intel/pmc: Create generic_core_init() for all platforms Xi Pardee
2025-01-10 11:38 ` Ilpo Järvinen
2025-01-10 0:26 ` [PATCH v4 4/6] platform/x86/intel/pmc: Create architecture specific callback Xi Pardee
2025-01-10 11:50 ` Ilpo Järvinen
2025-01-14 16:39 ` Xi Pardee
2025-01-14 23:13 ` Xi Pardee
2025-01-10 0:26 ` [PATCH v4 5/6] platform/x86/intel/pmc: Remove init functions per architecture Xi Pardee
2025-01-10 0:26 ` [PATCH v4 6/6] platform/x86/intel/pmc: Add Arrow Lake U/H support to intel_pmc_core driver Xi Pardee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250110002612.244782-3-xi.pardee@linux.intel.com \
--to=xi.pardee@linux.intel.com \
--cc=david.e.box@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=irenic.rajneesh@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rajvi0912@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.