nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 09:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: Rename functions to match close functionality

Browse Source 
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 <maheshp@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2209755
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Mahesh Patil
2019-10-01 16:23:46 -07:00
committed by Revanth Kumar Uppala
parent 1559acd4db
commit ece7ed224b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -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) { if (ret < 0) {
dev_err(&dev->dev, "failed to poll MAC Software reset\n"); dev_err(&dev->dev, "failed to poll MAC Software reset\n");
goto err_poll_swr; 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) { if (ret < 0) {
dev_err(dev, "failed to poll mac software reset\n"); dev_err(dev, "failed to poll mac software reset\n");
return ret; return ret;

6
drivers/net/ethernet/nvidia/nvethernet/ptp.c
View File

@@ -63,12 +63,12 @@ static inline u64 ether_get_ptptime(void *data)
* hardware clock. * hardware clock.
* *
* @param[in] ptp: Pointer to ptp_clock_info structure. * @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 0 on success
* @retval "negative value" on failure. * @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 *pdata = container_of(ptp,
struct ether_priv_data, 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); raw_spin_lock(&pdata->ptp_lock);
ret = osi_adjust_time(osi_core, delta); ret = osi_adjust_time(osi_core, nsec_delta);
if (ret < 0) { if (ret < 0) {
dev_err(pdata->dev, dev_err(pdata->dev,
"%s:failed to adjust time with reason %d\n", "%s:failed to adjust time with reason %d\n",