From: Bastien Nocera <hadess@hadess.net>
To: linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Bastien Nocera <hadess@hadess.net>
Subject: [PATCH v2 10/11] HID: wacom: Use pm_ptr instead of #ifdef CONFIG_PM
Date: Tue, 13 Jan 2026 10:24:58 +0100 [thread overview]
Message-ID: <20260113092546.265734-11-hadess@hadess.net> (raw)
In-Reply-To: <20260113092546.265734-1-hadess@hadess.net>
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/wacom_sys.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 9a57504e51a1..afc900560706 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2921,7 +2921,6 @@ static void wacom_remove(struct hid_device *hdev)
wacom_release_resources(wacom);
}
-#ifdef CONFIG_PM
static int wacom_resume(struct hid_device *hdev)
{
struct wacom *wacom = hid_get_drvdata(hdev);
@@ -2941,7 +2940,6 @@ static int wacom_reset_resume(struct hid_device *hdev)
{
return wacom_resume(hdev);
}
-#endif /* CONFIG_PM */
static struct hid_driver wacom_driver = {
.name = "wacom",
@@ -2949,10 +2947,8 @@ static struct hid_driver wacom_driver = {
.probe = wacom_probe,
.remove = wacom_remove,
.report = wacom_wac_report,
-#ifdef CONFIG_PM
- .resume = wacom_resume,
- .reset_resume = wacom_reset_resume,
-#endif
+ .resume = pm_ptr(wacom_resume),
+ .reset_resume = pm_ptr(wacom_reset_resume),
.raw_event = wacom_raw_event,
};
module_hid_driver(wacom_driver);
--
2.52.0
next prev parent reply other threads:[~2026-01-13 9:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-13 9:24 [PATCH v2 00/11] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 01/11] HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 02/11] HID: appletb-kbd: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 03/11] HID: asus: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 04/11] HID: lenovo: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 05/11] HID: logitech-dj: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 06/11] HID: nintendo: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 07/11] HID: picolcd_core: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 08/11] HID: hid-sensor-hub: " Bastien Nocera
2026-01-13 9:24 ` [PATCH v2 09/11] HID: uclogic: " Bastien Nocera
2026-01-13 9:24 ` Bastien Nocera [this message]
2026-01-13 9:24 ` [PATCH v2 11/11] HID: sony: " Bastien Nocera
2026-01-21 14:00 ` [PATCH v2 00/11] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Jiri Kosina
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=20260113092546.265734-11-hadess@hadess.net \
--to=hadess@hadess.net \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@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