From ece7ed224b03cb598e56924cf4538ea2c62a0690 Mon Sep 17 00:00:00 2001 From: Mahesh Patil Date: Tue, 1 Oct 2019 16:23:46 -0700 Subject: [PATCH] nvethernet: Rename functions to match close functionality Issue: rename functions to match close functionality Fix: 1) Renamed osi_poll_for_swr() to osi_poll_for_mac_reset_complete() Bug 2715276 Change-Id: I939d9804350110b3d28c16ff511390ce5ab0c625 Signed-off-by: Mahesh Patil Reviewed-on: https://git-master.nvidia.com/r/2209755 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 4 ++-- drivers/net/ethernet/nvidia/nvethernet/ptp.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 3766caa5..52b74aa6 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -1286,7 +1286,7 @@ static int ether_open(struct net_device *dev) } } - ret = osi_poll_for_swr(osi_core); + ret = osi_poll_for_mac_reset_complete(osi_core); if (ret < 0) { dev_err(&dev->dev, "failed to poll MAC Software reset\n"); goto err_poll_swr; @@ -3982,7 +3982,7 @@ static int ether_resume(struct ether_priv_data *pdata) } } - ret = osi_poll_for_swr(osi_core); + ret = osi_poll_for_mac_reset_complete(osi_core); if (ret < 0) { dev_err(dev, "failed to poll mac software reset\n"); return ret; diff --git a/drivers/net/ethernet/nvidia/nvethernet/ptp.c b/drivers/net/ethernet/nvidia/nvethernet/ptp.c index 8b85a1f7..e8e0d296 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ptp.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ptp.c @@ -63,12 +63,12 @@ static inline u64 ether_get_ptptime(void *data) * hardware clock. * * @param[in] ptp: Pointer to ptp_clock_info structure. - * @param[in] delta: Desired change in nanoseconds. + * @param[in] nsec_delta: Desired change in nanoseconds w.r.t System time * * @retval 0 on success * @retval "negative value" on failure. */ -static int ether_adjust_time(struct ptp_clock_info *ptp, s64 delta) +static int ether_adjust_time(struct ptp_clock_info *ptp, s64 nsec_delta) { struct ether_priv_data *pdata = container_of(ptp, struct ether_priv_data, @@ -78,7 +78,7 @@ static int ether_adjust_time(struct ptp_clock_info *ptp, s64 delta) raw_spin_lock(&pdata->ptp_lock); - ret = osi_adjust_time(osi_core, delta); + ret = osi_adjust_time(osi_core, nsec_delta); if (ret < 0) { dev_err(pdata->dev, "%s:failed to adjust time with reason %d\n",