diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-09-09 11:21:04 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2024-09-11 10:58:18 +0200 |
commit | cd0983c7f8809d685bc57eda1f11cc1cdb67b9ac (patch) | |
tree | 5288532c8f33d3a7775a683e8b94f35a6bbbe558 /drivers/net | |
parent | 709cbd5bb49b54c3d73c1a89b8ebce09c10ed2ed (diff) | |
download | linux-stable-cd0983c7f8809d685bc57eda1f11cc1cdb67b9ac.tar.gz linux-stable-cd0983c7f8809d685bc57eda1f11cc1cdb67b9ac.tar.bz2 linux-stable-cd0983c7f8809d685bc57eda1f11cc1cdb67b9ac.zip |
can: rockchip_canfd: rkcanfd_timestamp_init(): rework delay calculation
Rework the delay calculation to only require a single 64-bit division.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[mkl: port to on-top of existing 32-bit division fix]
Link: https://patch.msgid.link/20240911-can-rockchip_canfd-fixes-v1-1-5ce385b5ab10@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/can/rockchip/rockchip_canfd-timestamp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/rockchip/rockchip_canfd-timestamp.c b/drivers/net/can/rockchip/rockchip_canfd-timestamp.c index fb1a8f4e6217..43d4b5721812 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-timestamp.c +++ b/drivers/net/can/rockchip/rockchip_canfd-timestamp.c @@ -71,8 +71,8 @@ void rkcanfd_timestamp_init(struct rkcanfd_priv *priv) max_cycles = div_u64(ULLONG_MAX, cc->mult); max_cycles = min(max_cycles, cc->mask); - work_delay_ns = div_u64(clocksource_cyc2ns(max_cycles, cc->mult, cc->shift), 3); - priv->work_delay_jiffies = nsecs_to_jiffies(work_delay_ns); + work_delay_ns = clocksource_cyc2ns(max_cycles, cc->mult, cc->shift); + priv->work_delay_jiffies = div_u64(work_delay_ns, 3u * NSEC_PER_SEC / HZ); INIT_DELAYED_WORK(&priv->timestamp, rkcanfd_timestamp_work); netdev_dbg(priv->ndev, "clock=%lu.%02luMHz bitrate=%lu.%02luMBit/s div=%u rate=%lu.%02luMHz mult=%u shift=%u delay=%lus\n", |