Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: xilinx_uartps: Use helper function hrtimer_update_function()

The field 'function' of struct hrtimer should not be changed directly, as
the write is lockless and a concurrent timer expiry might end up using the
wrong function pointer.

Switch to use hrtimer_update_function() which also performs runtime checks
that it is safe to modify the callback.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/af7823518fb060c6c97105a2513cfc61adbdf38f.1738746927.git.namcao@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Nam Cao and committed by
Greg Kroah-Hartman
a2d1afe6 1bd2aad5

+2 -2
+2 -2
drivers/tty/serial/xilinx_uartps.c
··· 454 454 455 455 if (cdns_uart->port->rs485.flags & SER_RS485_ENABLED && 456 456 (kfifo_is_empty(&tport->xmit_fifo) || uart_tx_stopped(port))) { 457 - cdns_uart->tx_timer.function = &cdns_rs485_rx_callback; 457 + hrtimer_update_function(&cdns_uart->tx_timer, cdns_rs485_rx_callback); 458 458 hrtimer_start(&cdns_uart->tx_timer, 459 459 ns_to_ktime(cdns_calc_after_tx_delay(cdns_uart)), HRTIMER_MODE_REL); 460 460 } ··· 734 734 735 735 if (cdns_uart->port->rs485.flags & SER_RS485_ENABLED) { 736 736 if (!cdns_uart->rs485_tx_started) { 737 - cdns_uart->tx_timer.function = &cdns_rs485_tx_callback; 737 + hrtimer_update_function(&cdns_uart->tx_timer, cdns_rs485_tx_callback); 738 738 cdns_rs485_tx_setup(cdns_uart); 739 739 return hrtimer_start(&cdns_uart->tx_timer, 740 740 ms_to_ktime(port->rs485.delay_rts_before_send),