From d923b020dcecb70687391fd311fc0a8affc37857 Mon Sep 17 00:00:00 2001
From: Luca Coelho <luciano.coelho@intel.com>
Date: Fri, 15 Nov 2019 09:27:28 +0200
Subject: [PATCH] iwlwifi: mvm: remove else-if in iwl_send_phy_cfg_cmd()
Git-commit: d923b020dcecb70687391fd311fc0a8affc37857
Patch-mainline: v5.5-rc1
References: jsc#SLE-13430
We return in the if block, so it's unnecessary to have an else
statement. Remove it.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index c59cbb8cbdd7..66e14f590b6d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -515,9 +515,10 @@ static int iwl_send_phy_cfg_cmd(struct iwl_mvm *mvm)
enum iwl_ucode_type ucode_type = mvm->fwrt.cur_fw_img;
if (iwl_mvm_has_unified_ucode(mvm) &&
- !mvm->trans->cfg->tx_with_siso_diversity) {
+ !mvm->trans->cfg->tx_with_siso_diversity)
return 0;
- } else if (mvm->trans->cfg->tx_with_siso_diversity) {
+
+ if (mvm->trans->cfg->tx_with_siso_diversity) {
/*
* TODO: currently we don't set the antenna but letting the NIC
* to decide which antenna to use. This should come from BIOS.
--
2.16.4