From 1a3fed7006fe926a0109ef91a1e8ecf5c4aa9bf9 Mon Sep 17 00:00:00 2001 From: harsukhwinde Date: Mon, 16 Dec 2024 06:13:09 +0000 Subject: [PATCH] nvethernet:change osd_usleep_range with osd_usleep osd_usleep function using fsleep internally instead of usleep. usleep has backward compatibility issue with andriod in gvs Bug 4921002 Change-Id: Id3a1b5593decf9efbe175ed4490c851072437e71 Signed-off-by: Harsukhwinder Singh Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3268621 GVS: buildbot_gerritrpt Reviewed-by: svcacv Reviewed-by: Bhadram Varka Reviewed-by: Srinivas Ramachandran --- drivers/net/ethernet/nvidia/nvethernet/osd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/osd.c b/drivers/net/ethernet/nvidia/nvethernet/osd.c index aed2eb35..69d8c972 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/osd.c +++ b/drivers/net/ethernet/nvidia/nvethernet/osd.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "ether_linux.h" @@ -100,11 +100,10 @@ static void osd_udelay(unsigned long long usec) * Algorithm: Invokes OSD function to add sleep. * * @param[in] umin: Minimum sleep required in micro seconds. - * @param[in] umax: Maximum sleep required in micro seconds. */ -static void osd_usleep_range(unsigned long long umin, unsigned long long umax) +static void osd_usleep(unsigned long long usec) { - usleep_range(umin, umax); + fsleep(usec); } /** @@ -926,7 +925,7 @@ void ether_assign_osd_ops(struct osi_core_priv_data *osi_core, { osi_core->osd_ops.ops_log = osd_log; osi_core->osd_ops.udelay = osd_udelay; - osi_core->osd_ops.usleep_range = osd_usleep_range; + osi_core->osd_ops.usleep = osd_usleep; osi_core->osd_ops.padctrl_mii_rx_pins = ether_padctrl_mii_rx_pins; #ifdef OSI_DEBUG osi_core->osd_ops.printf = osd_core_printf;