From: Lukas Bulwahn <lbulwahn@redhat.com>
To: "Rajneesh Bhardwaj" <irenic.rajneesh@gmail.com>,
"David E Box" <david.e.box@intel.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Daniel Lezcano" <daniel.lezcano@linaro.org>,
platform-driver-x86@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Lukas Bulwahn <lukas.bulwahn@redhat.com>
Subject: [PATCH] platform/x86:intel/pmc: fix IS_ENABLED() check
Date: Tue, 24 Sep 2024 10:40:56 +0200 [thread overview]
Message-ID: <20240924084056.48447-1-lukas.bulwahn@redhat.com> (raw)
From: Lukas Bulwahn <lukas.bulwahn@redhat.com>
Commit d7a87891e2f5 ("platform/x86:intel/pmc: fix build regression with
pmtimer turned off") accidentally slips in some CONFIG_CONFIG_X86_PM_TIMER
(note the duplicated CONFIG prefix) in the IS_ENABLED() check.
Fortunately, ./scripts/checkkconfigsymbols.py notices this accident. Fix up
the IS_ENABLED() check with the intended config name.
Fixes: d7a87891e2f5 ("platform/x86:intel/pmc: fix build regression with pmtimer turned off")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@redhat.com>
---
drivers/platform/x86/intel/pmc/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index 0431a599ba26..4387b5103701 100644
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1546,7 +1546,7 @@ static int pmc_core_probe(struct platform_device *pdev)
pmc_core_adjust_slp_s0_step(primary_pmc, 1));
map = primary_pmc->map;
- if (IS_ENABLED(CONFIG_CONFIG_X86_PM_TIMER) &&
+ if (IS_ENABLED(CONFIG_X86_PM_TIMER) &&
map->acpi_pm_tmr_ctl_offset)
acpi_pmtmr_register_suspend_resume_callback(pmc_core_acpi_pm_timer_suspend_resume,
pmcdev);
@@ -1563,7 +1563,7 @@ static void pmc_core_remove(struct platform_device *pdev)
const struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
const struct pmc_reg_map *map = pmc->map;
- if (IS_ENABLED(CONFIG_CONFIG_X86_PM_TIMER) &&
+ if (IS_ENABLED(CONFIG_X86_PM_TIMER) &&
map->acpi_pm_tmr_ctl_offset)
acpi_pmtmr_unregister_suspend_resume_callback();
--
2.46.1
next reply other threads:[~2024-09-24 8:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-24 8:40 Lukas Bulwahn [this message]
2024-09-24 8:48 ` Arnd Bergmann
2024-10-05 13:16 ` Hans de Goede
2024-10-21 14:15 ` Hans de Goede
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=20240924084056.48447-1-lukas.bulwahn@redhat.com \
--to=lbulwahn@redhat.com \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=david.e.box@intel.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=irenic.rajneesh@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.bulwahn@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®