The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Luke Jones <luke@ljones.dev>
To: linux-kernel@vger.kernel.org
Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com,
	platform-driver-x86@vger.kernel.org, mario.limonciello@amd.com,
	andriy.shevchenko@linux.intel.com, Luke Jones <luke@ljones.dev>,
	kernel test robot <lkp@intel.com>
Subject: [PATCH 1/1] platform/x86: asus-wmi: fix build without CONFIG_SUSPEND
Date: Fri, 23 May 2025 15:14:51 +0200	[thread overview]
Message-ID: <20250523131451.1942578-2-luke@ljones.dev> (raw)
In-Reply-To: <20250523131451.1942578-1-luke@ljones.dev>

The patch "Refactor Ally suspend/resume" introduced an
acpi_s2idle_dev_ops for use with ROG Ally which caused a build error
if CONFIG_SUSPEND was not defined.

Signed-off-by: Luke Jones <luke@ljones.dev>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202505090418.DaeaXe4i-lkp@intel.com/
Fixes: feea7bd6b02d ("platform/x86: asus-wmi: Refactor Ally suspend/resume")
---
 drivers/platform/x86/asus-wmi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 27f11643a00d..087318e0d595 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -5005,6 +5005,7 @@ static int asus_hotk_restore(struct device *device)
 	return 0;
 }
 
+#if defined(CONFIG_SUSPEND)
 static void asus_ally_s2idle_restore(void)
 {
 	if (use_ally_mcu_hack == ASUS_WMI_ALLY_MCU_HACK_ENABLED) {
@@ -5013,6 +5014,7 @@ static void asus_ally_s2idle_restore(void)
 		msleep(ASUS_USB0_PWR_EC0_CSEE_WAIT);
 	}
 }
+#endif /* CONFIG_SUSPEND */
 
 static int asus_hotk_prepare(struct device *device)
 {
@@ -5025,9 +5027,11 @@ static int asus_hotk_prepare(struct device *device)
 }
 
 /* Use only for Ally devices due to the wake_on_ac */
+#if defined(CONFIG_SUSPEND)
 static struct acpi_s2idle_dev_ops asus_ally_s2idle_dev_ops = {
 	.restore = asus_ally_s2idle_restore,
 };
+#endif /* CONFIG_SUSPEND */
 
 static const struct dev_pm_ops asus_pm_ops = {
 	.thaw = asus_hotk_thaw,
@@ -5060,9 +5064,11 @@ static int asus_wmi_probe(struct platform_device *pdev)
 			return ret;
 	}
 
+	#if defined(CONFIG_SUSPEND)
 	ret = acpi_register_lps0_dev(&asus_ally_s2idle_dev_ops);
 	if (ret)
 		pr_warn("failed to register LPS0 sleep handler in asus-wmi\n");
+	#endif /* CONFIG_SUSPEND */
 
 	return asus_wmi_add(pdev);
 }
@@ -5096,7 +5102,10 @@ EXPORT_SYMBOL_GPL(asus_wmi_register_driver);
 
 void asus_wmi_unregister_driver(struct asus_wmi_driver *driver)
 {
+	#if defined(CONFIG_SUSPEND)
 	acpi_unregister_lps0_dev(&asus_ally_s2idle_dev_ops);
+	#endif /* CONFIG_SUSPEND */
+
 	platform_device_unregister(driver->platform_device);
 	platform_driver_unregister(&driver->platform_driver);
 	used = false;
-- 
2.49.0


  reply	other threads:[~2025-05-23 13:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-23 13:14 [PATCH 0/1] platform/x86: asus-wmi: fix build without CONFIG_SUSPEND Luke Jones
2025-05-23 13:14 ` Luke Jones [this message]
2025-05-23 13:25   ` [PATCH 1/1] " Ilpo Järvinen
2025-05-23 18:44     ` Luke Jones
2025-05-25 20:52       ` Ilpo Järvinen

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=20250523131451.1942578-2-luke@ljones.dev \
    --to=luke@ljones.dev \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lkp@intel.com \
    --cc=mario.limonciello@amd.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