aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2025-06-03 09:24:39 +0200
committerJiri Kosina <jkosina@suse.com>2025-06-03 09:24:39 +0200
commit5b53c0e7df295490a5304f870e35a70d7bb68c1e (patch)
treeab8ebf01d6bf85548f1aab955b066ba55ef5efc7
parentMerge branch 'for-6.16/core' into for-linus (diff)
parentHID: corsair-void: Use to_delayed_work() (diff)
downloadlinux-rng-5b53c0e7df295490a5304f870e35a70d7bb68c1e.tar.xz
linux-rng-5b53c0e7df295490a5304f870e35a70d7bb68c1e.zip
Merge branch 'for-6.16/corsair' into for-linus
-rw-r--r--drivers/hid/hid-corsair-void.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-corsair-void.c b/drivers/hid/hid-corsair-void.c
index afbd67aa9719..fee134a7eba3 100644
--- a/drivers/hid/hid-corsair-void.c
+++ b/drivers/hid/hid-corsair-void.c
@@ -507,7 +507,7 @@ static void corsair_void_status_work_handler(struct work_struct *work)
struct delayed_work *delayed_work;
int battery_ret;
- delayed_work = container_of(work, struct delayed_work, work);
+ delayed_work = to_delayed_work(work);
drvdata = container_of(delayed_work, struct corsair_void_drvdata,
delayed_status_work);
@@ -525,7 +525,7 @@ static void corsair_void_firmware_work_handler(struct work_struct *work)
struct delayed_work *delayed_work;
int firmware_ret;
- delayed_work = container_of(work, struct delayed_work, work);
+ delayed_work = to_delayed_work(work);
drvdata = container_of(delayed_work, struct corsair_void_drvdata,
delayed_firmware_work);