nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: Remove backup_config checks

Browse Source 
As the osi_core_private_data structure
backup_config variable got updated to
core_backup structure type remove this
variable NULL check.

Bug 200596517

Change-Id: I3911ef285eaa7af60f7d9e75b11b23d38773b06b
Signed-off-by: Mohan Thadikamalla <mohant@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2315796
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bhadram Varka <vbhadram@nvidia.com>
Reviewed-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Mohan Thadikamalla
2020-03-17 13:20:41 +05:30
committed by Revanth Kumar Uppala
parent 7ae3a8cdb0
commit b18ab27659
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3937,11 +3937,9 @@ static int ether_suspend_noirq(struct device *dev)
* current configuration so that SW view of HW is maintained across
* suspend/resume.
*/
if (osi_core->backup_config) {
if (osi_save_registers(osi_core)) {
dev_err(dev, "Failed to backup MAC core registers\n");
return -EBUSY;
}
if (osi_save_registers(osi_core)) {
dev_err(dev, "Failed to backup MAC core registers\n");
return -EBUSY;
}
/* Stop workqueue while DUT is going to suspend state */
@@ -4107,11 +4105,10 @@ static int ether_resume_noirq(struct device *dev)
* Restore the backup of the MAC configuration to maintain consistency
* between SW/HW state.
*/
if (osi_core->backup_config) {
if (osi_restore_registers(osi_core)) {
//TODO: Ideally, undo MAC init/resume & return.
dev_err(dev, "Failed to restore MAC core registers\n");
}
if (osi_restore_registers(osi_core)) {
//TODO: Ideally, undo MAC init/resume & return.
dev_err(dev, "Failed to restore MAC core registers\n");
return -EIO;
}
return 0;