From 48b168bbfa97e4ebb7c093696c27dfb32bf82ad8 Mon Sep 17 00:00:00 2001 From: Tim Harvey Date: Tue, 19 May 2015 10:01:20 -0700 Subject: [PATCH] e1000: remove unnecessary clearing of SWSM.SWSM_SMBI remove unnecessary clearing of SWSM.SWSM_SMBI when obtaining the SW semaphore. This was introduced in 951860634fdb557bbb58e0f99215391bc0c29779 while adding i210 support and should be now resolved by releasing the semaphore when no longer needed. Cc: Marcel Ziswiler Cc: Marek Vasut Cc: Aneesh Bansal Cc: Naveen Burmi Cc: Po Liu Cc: Bin Meng Cc: Alison Wang Cc: Reinhard Arlt Cc: Shengzhou Liu Cc: York Sun Signed-off-by: Tim Harvey Tested-by: Bin Meng Tested-by: Marcel Ziswiler --- drivers/net/e1000.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 739d24b280..ecd1a52e47 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -996,10 +996,6 @@ e1000_get_software_semaphore(struct e1000_hw *hw) DEBUGFUNC(); - swsm = E1000_READ_REG(hw, SWSM); - swsm &= ~E1000_SWSM_SMBI; - E1000_WRITE_REG(hw, SWSM, swsm); - if (hw->mac_type != e1000_80003es2lan) return E1000_SUCCESS; -- 2.39.5