From b18ab27659636c2cd78157adbbc08b1bc95f1a40 Mon Sep 17 00:00:00 2001 From: Mohan Thadikamalla Date: Tue, 17 Mar 2020 13:20:41 +0530 Subject: [PATCH] nvethernet: Remove backup_config checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2315796 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bhadram Varka Reviewed-by: Narayan Reddy Reviewed-by: Bitan Biswas Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- .../ethernet/nvidia/nvethernet/ether_linux.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 00065523..5d12a03c 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -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;