Commit a246ac38 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwl8k: Move tx/rx antenna configuration to mwl8k_probe_hw 



This avoids calling mwl8k_cmd_rf_antenna functions every
time mwl8k_config function is called.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0f4316b9

drivers/net/wireless/mwl8k.c

+9 −6
Original line number Diff line number Diff line
@@ -4814,12 +4814,6 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed) 
				goto out;

		}



		rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x3);

		if (rc)

			wiphy_warn(hw->wiphy, "failed to set # of RX antennas");

		rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7);

		if (rc)

			wiphy_warn(hw->wiphy, "failed to set # of TX antennas");



	} else {

		rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);
@@ -5709,6 +5703,15 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw) 
		goto err_free_irq;

	}



	/* Configure Antennas */

	rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x3);

	if (rc)

		wiphy_warn(hw->wiphy, "failed to set # of RX antennas");

	rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7);

	if (rc)

		wiphy_warn(hw->wiphy, "failed to set # of TX antennas");





	/* Disable interrupts */

	iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);

	free_irq(priv->pdev->irq, hw);

CRA Git | Maintained and supported by SUSTech CRA and CCSE