| Message ID | 20210923153339.684546907@linutronix.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | hrtimers: Cleanup hrtimer_forward() [ab]use | expand |
On 23.09.2021 18:04:27, Thomas Gleixner wrote: > hrtimer_forward_now() provides the same functionality as the open coded > hrimer_forward() invocation. Prepares for removal of hrtimer_forward() from > the public interfaces. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: Oliver Hartkopp <socketcan@hartkopp.net> > Cc: linux-can@vger.kernel.org > Cc: Marc Kleine-Budde <mkl@pengutronix.de> > Cc: netdev@vger.kernel.org > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: "David S. Miller" <davem@davemloft.net> Tnx, applied to linux-can-next/testing. regards, Marc
--- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -625,7 +625,7 @@ static enum hrtimer_restart bcm_rx_thr_h struct bcm_op *op = container_of(hrtimer, struct bcm_op, thrtimer); if (bcm_rx_thr_flush(op)) { - hrtimer_forward(hrtimer, ktime_get(), op->kt_ival2); + hrtimer_forward_now(hrtimer, op->kt_ival2); return HRTIMER_RESTART; } else { /* rearm throttle handling */
hrtimer_forward_now() provides the same functionality as the open coded hrimer_forward() invocation. Prepares for removal of hrtimer_forward() from the public interfaces. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Oliver Hartkopp <socketcan@hartkopp.net> Cc: linux-can@vger.kernel.org Cc: Marc Kleine-Budde <mkl@pengutronix.de> Cc: netdev@vger.kernel.org Cc: Jakub Kicinski <kuba@kernel.org> Cc: "David S. Miller" <davem@davemloft.net> --- net/can/bcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)