diff --git a/drivers/net/ethernet/nvidia/nvethernet/ptp.c b/drivers/net/ethernet/nvidia/nvethernet/ptp.c index 0472350c..dfa4c368 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ptp.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ptp.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. -#include #include "ether_linux.h" /** @@ -130,11 +129,7 @@ static int ether_adjust_time(struct ptp_clock_info *ptp, s64 nsec_delta) * @retval 0 on success * @retval "negative value" on failure. */ -#if KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE -static int ether_adjust_clock(struct ptp_clock_info *ptp, s32 ppb) -#else static int ether_adjust_clock(struct ptp_clock_info *ptp, long scaled_ppm) -#endif { struct ether_priv_data *pdata = container_of(ptp, struct ether_priv_data, @@ -143,14 +138,11 @@ static int ether_adjust_clock(struct ptp_clock_info *ptp, long scaled_ppm) struct osi_ioctl ioctl_data = {}; unsigned long flags; int ret = -1; -#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE - s32 ppb = scaled_ppm_to_ppb(scaled_ppm); -#endif raw_spin_lock_irqsave(&pdata->ptp_lock, flags); ioctl_data.cmd = OSI_CMD_ADJ_FREQ; - ioctl_data.arg6_32 = ppb; + ioctl_data.arg6_32 = scaled_ppm_to_ppb(scaled_ppm); ret = osi_handle_ioctl(osi_core, &ioctl_data); if (ret < 0) { dev_err(pdata->dev, @@ -253,11 +245,7 @@ static struct ptp_clock_info ether_ptp_clock_ops = { .n_ext_ts = 0, .n_per_out = 0, .pps = 0, -#if KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE - .adjfreq = ether_adjust_clock, -#else .adjfine = ether_adjust_clock, -#endif .adjtime = ether_adjust_time, .gettime64 = ether_get_time, .settime64 = ether_set_time,