Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c7e89e authored Apr 28, 2016 by Jes Sorensen Committed by Kalle Valo May 03, 2016

rtl8xxxu: rtl8xxxu_prepare_calibrate() is never used on gen1



Rename it to rtl8xxxu_gen2_prepare_calibrate() and remove the calls to
it from rtl8xxxu_gen1_phy_iq_calibrate()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 9c0343d4

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1388,7 +1388,7 @@ void rtl8xxxu_firmware_self_reset(struct rtl8xxxu_priv *priv);
	void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv);		void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv);
	void rtl8xxxu_reset_8051(struct rtl8xxxu_priv *priv);		void rtl8xxxu_reset_8051(struct rtl8xxxu_priv *priv);
	int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page);		int rtl8xxxu_auto_llt_table(struct rtl8xxxu_priv *priv, u8 last_tx_page);
	void rtl8xxxu_prepare_calibrate(struct rtl8xxxu_priv *priv, u8 start);		void rtl8xxxu_gen2_prepare_calibrate(struct rtl8xxxu_priv *priv, u8 start);
	int rtl8xxxu_flush_fifo(struct rtl8xxxu_priv *priv);		int rtl8xxxu_flush_fifo(struct rtl8xxxu_priv *priv);
	int rtl8xxxu_gen2_h2c_cmd(struct rtl8xxxu_priv *priv,		int rtl8xxxu_gen2_h2c_cmd(struct rtl8xxxu_priv *priv,
	struct h2c_cmd *h2c, int len);		struct h2c_cmd *h2c, int len);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1108,7 +1108,7 @@ static void rtl8723bu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
	s32 reg_tmp = 0;		s32 reg_tmp = 0;
	bool simu;		bool simu;

	rtl8xxxu_prepare_calibrate(priv, 1);		rtl8xxxu_gen2_prepare_calibrate(priv, 1);

	memset(result, 0, sizeof(result));		memset(result, 0, sizeof(result));
	candidate = -1;		candidate = -1;
	@@ -1217,7 +1217,7 @@ static void rtl8723bu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
	if (priv->rf_paths > 1)		if (priv->rf_paths > 1)
	dev_dbg(dev, "%s: 8723BU 2T not supported\n", __func__);		dev_dbg(dev, "%s: 8723BU 2T not supported\n", __func__);

	rtl8xxxu_prepare_calibrate(priv, 0);		rtl8xxxu_gen2_prepare_calibrate(priv, 0);
	}		}

	static int rtl8723bu_active_to_emu(struct rtl8xxxu_priv *priv)		static int rtl8723bu_active_to_emu(struct rtl8xxxu_priv *priv)

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3307,13 +3307,10 @@ static void rtl8xxxu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
	}		}
	}		}

	void rtl8xxxu_prepare_calibrate(struct rtl8xxxu_priv *priv, u8 start)		void rtl8xxxu_gen2_prepare_calibrate(struct rtl8xxxu_priv *priv, u8 start)
	{		{
	struct h2c_cmd h2c;		struct h2c_cmd h2c;

	if (priv->fops->mbox_ext_width < 4)
	return;

	memset(&h2c, 0, sizeof(struct h2c_cmd));		memset(&h2c, 0, sizeof(struct h2c_cmd));
	h2c.bt_wlan_calibration.cmd = H2C_8723B_BT_WLAN_CALIBRATION;		h2c.bt_wlan_calibration.cmd = H2C_8723B_BT_WLAN_CALIBRATION;
	h2c.bt_wlan_calibration.data = start;		h2c.bt_wlan_calibration.data = start;
	@@ -3332,8 +3329,6 @@ void rtl8xxxu_gen1_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
	s32 reg_tmp = 0;		s32 reg_tmp = 0;
	bool simu;		bool simu;

	rtl8xxxu_prepare_calibrate(priv, 1);

	memset(result, 0, sizeof(result));		memset(result, 0, sizeof(result));
	candidate = -1;		candidate = -1;

	@@ -3421,8 +3416,6 @@ void rtl8xxxu_gen1_phy_iq_calibrate(struct rtl8xxxu_priv *priv)

	rtl8xxxu_save_regs(priv, rtl8xxxu_iqk_phy_iq_bb_reg,		rtl8xxxu_save_regs(priv, rtl8xxxu_iqk_phy_iq_bb_reg,
	priv->bb_recovery_backup, RTL8XXXU_BB_REGS);		priv->bb_recovery_backup, RTL8XXXU_BB_REGS);

	rtl8xxxu_prepare_calibrate(priv, 0);
	}		}

	static void rtl8723a_phy_lc_calibrate(struct rtl8xxxu_priv *priv)		static void rtl8723a_phy_lc_calibrate(struct rtl8xxxu_priv *priv)