diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-08 11:33:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-08 11:33:00 -0700 |
| commit | be54f8c558027a218423134dd9b8c7c46d92204a (patch) | |
| tree | 377e61e2a2942f6c42a4406751b815c8e27d8103 /drivers/misc/cardreader/rtsx_usb.c | |
| parent | 0529ef8c36d74a05e929ea4adbdecd2c3393b0bb (diff) | |
| parent | 41cb08555c4164996d67c78b3bf1c658075b75f1 (diff) | |
Merge tag 'timers-cleanups-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer cleanup from Thomas Gleixner:
"The delayed from_timer() API cleanup:
The renaming to the timer_*() namespace was delayed due massive
conflicts against Linux-next. Now that everything is upstream finish
the conversion"
* tag 'timers-cleanups-2025-06-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
treewide, timers: Rename from_timer() to timer_container_of()
Diffstat (limited to 'drivers/misc/cardreader/rtsx_usb.c')
| -rw-r--r-- | drivers/misc/cardreader/rtsx_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cardreader/rtsx_usb.c b/drivers/misc/cardreader/rtsx_usb.c index 7314c8d9ae75..148107a4547c 100644 --- a/drivers/misc/cardreader/rtsx_usb.c +++ b/drivers/misc/cardreader/rtsx_usb.c @@ -31,7 +31,7 @@ static const struct mfd_cell rtsx_usb_cells[] = { static void rtsx_usb_sg_timed_out(struct timer_list *t) { - struct rtsx_ucr *ucr = from_timer(ucr, t, sg_timer); + struct rtsx_ucr *ucr = timer_container_of(ucr, t, sg_timer); dev_dbg(&ucr->pusb_intf->dev, "%s: sg transfer timed out", __func__); usb_sg_cancel(&ucr->current_sg); |