iwlwifi: mvm: remove some dead code

PATCH In review Dan Carpenter 2 participants 4 messages May 7, 2015

Subsystems (2)

Kernel janitors Networking drivers (wireless)

lore

Share & tools

lore

Dan Carpenter

author

2015-05-07 09:58 UTC #0 lore raw

PATCH 1/1 iwlwifi: mvm: remove some dead code

"ret" is zero here so we can remove this stray check.

Signed-off-by Dan Carpenter <[email protected]>

drivers/net/wireless/iwlwifi/mvm/fw.c +0 -2

index df86963..41f4763 100644
@@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_start_hw(mvm->trans, false);
-		if (ret)
-			return ret;
 	}
 
 	if (iwlmvm_mod_params.init_dbg)

Johannes Berg

maintainer

2015-05-07 12:27 UTC #1 lore raw

Quoted 9 lines · Dan Carpenter

"ret" is zero here so we can remove this stray check.
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/wireless/iwlwifi/mvm/fw.c +0 -0
index df86963..41f4763 100644

drivers/net/wireless/iwlwifi/mvm/fw.c int iwl_mvm_up(struct iwl_mvm *mvm) · line 667

Quoted 5 lines

drivers/net/wireless/iwlwifi/mvm/fw.c +0 -2

@@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_start_hw(mvm->trans, false);
-		if (ret)
-			return ret;

It looks like "ret = _iwl_trans_start_hw(...)" was intended though?

johannes

Dan Carpenter

author

2015-05-07 12:42 UTC #2 lore raw

Quoted 5 lines · Johannes Berg

Quoted 4 lines · Dan Carpenter
"ret" is zero here so we can remove this stray check.
Signed-off-by Dan Carpenter <[email protected]>

Quoted 13 lines

drivers/net/wireless/iwlwifi/mvm/fw.c int iwl_mvm_up(struct iwl_mvm *mvm) · line 667
Quoted 10 lines
drivers/net/wireless/iwlwifi/mvm/fw.c +0 -2
index df86963..41f4763 100644
@@ -663,8 +663,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_start_hw(mvm->trans, false);
-		if (ret)
-			return ret;
It looks like "ret = _iwl_trans_start_hw(...)" was intended though?

Hm... You may be right. Should it also be "goto error;" instead of a direct return? I'm not positive. Eran can you fix this and give me a Reported-by tag?

regards,
dan carpenter

Johannes Berg

maintainer

2015-05-07 12:47 UTC #3 lore raw

Quoted 10 lines · Dan Carpenter

Quoted 7 lines
drivers/net/wireless/iwlwifi/mvm/fw.c int iwl_mvm_up(struct iwl_mvm *mvm) · line 667
Quoted 4 lines
drivers/net/wireless/iwlwifi/mvm/fw.c +0 -2
 		_iwl_trans_stop_device(mvm->trans, false);
 		_iwl_trans_start_hw(mvm->trans, false);
-		if (ret)
-			return ret;
It looks like "ret = _iwl_trans_start_hw(...)" was intended though?
Hm... You may be right. Should it also be "goto error;" instead of a direct return? I'm not positive.

Yes, looks like.

Quoted 1 line

Eran can you fix this and give me a Reported-by tag?

I think Eran is on sabbatical, I'll get this on the way internally with your reported-by.

johannes