Skip to content

Commit c1982c2

Browse files
xry111KexyBiscuit
authored andcommitted
AOSCOS: sb105x: Adapt for timer related function renames
The upstream has renamed the timer related functions to have a strict timer_ prefixed namespace. See commit 9b13df3 ("timers: Rename del_timer_sync() to timer_delete_sync()") and commit 41cb085 ("treewide, timers: Rename from_timer() to timer_container_of()"). Signed-off-by: Xi Ruoyao <[email protected]>
1 parent 17e62d0 commit c1982c2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/staging/sb105x/sb_pci_mp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2306,7 +2306,7 @@ static void serial_unlink_irq_chain(struct mp_port *mtpt)
23062306

23072307
static void multi_timeout(struct timer_list *t)
23082308
{
2309-
struct mp_port *mtpt = from_timer(mtpt, t, timer);
2309+
struct mp_port *mtpt = timer_container_of(mtpt, t, timer);
23102310

23112311
spin_lock(&mtpt->port.lock);
23122312
multi_handle_port(mtpt);
@@ -2481,7 +2481,7 @@ static void multi_shutdown(struct sb_uart_port *port)
24812481

24822482
if ((!is_real_interrupt(mtpt->port.irq))||(mtpt->poll_type==TYPE_POLL))
24832483
{
2484-
del_timer_sync(&mtpt->timer);
2484+
timer_delete_sync(&mtpt->timer);
24852485
}
24862486
else
24872487
{

0 commit comments

Comments
 (0)