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

Commit 9a84912c authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8188ee: Fix allyesconfig build failures 



An allyesconfig build of rtl8188ee yields the following duplicate entry points:

drivers/net/wireless/rtlwifi/rtl8188ee/built-in.o: In function `.rtl92c_phy_ap_calibrate':
(.text+0x21d14): multiple definition of `.rtl92c_phy_ap_calibrate'
drivers/net/wireless/rtlwifi/rtl8192c/built-in.o:(.text+0xb1e8): first defined here
drivers/net/wireless/rtlwifi/rtl8188ee/built-in.o: In function `rtl_hal_pwrseqcmdparsing':
(.opd+0xed0): multiple definition of `rtl_hal_pwrseqcmdparsing'

One of the routines is not used and can be deleted, the other is renamed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 07b72bf3

drivers/net/wireless/rtlwifi/rtl8188ee/hw.c

+9 −8
Original line number Diff line number Diff line
@@ -814,11 +814,11 @@ static bool _rtl88ee_init_mac(struct ieee80211_hw *hw) 


	rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00);

	/* HW Power on sequence */

	if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

				      PWR_INTF_PCI_MSK,

	if (!rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK,

					PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,

					Rtl8188E_NIC_ENABLE_FLOW)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

			 "init MAC Fail as rtl_hal_pwrseqcmdparsing\n");

			 "init MAC Fail as rtl88_hal_pwrseqcmdparsing\n");

		return false;

	}
@@ -1344,8 +1344,9 @@ static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw) 
	}

	rtl_write_byte(rtlpriv, REG_PCIE_CTRL_REG+1, 0xFF);



	rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

				 PWR_INTF_PCI_MSK, Rtl8188E_NIC_LPS_ENTER_FLOW);

	rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

				   PWR_INTF_PCI_MSK,

				   Rtl8188E_NIC_LPS_ENTER_FLOW);



	rtl_write_byte(rtlpriv, REG_RF_CTRL, 0x00);
@@ -1359,7 +1360,7 @@ static void _rtl88ee_poweroff_adapter(struct ieee80211_hw *hw) 
	u1b_tmp = rtl_read_byte(rtlpriv, REG_32K_CTRL);

	rtl_write_byte(rtlpriv, REG_32K_CTRL, (u1b_tmp & (~BIT(0))));



	rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

	rtl88_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,

				   PWR_INTF_PCI_MSK, Rtl8188E_NIC_DISABLE_FLOW);



	u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL+1);

drivers/net/wireless/rtlwifi/rtl8188ee/phy.c

+0 −10
Original line number Diff line number Diff line
@@ -2001,16 +2001,6 @@ void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw) 
	rtlphy->lck_inprogress = false;

}



void rtl92c_phy_ap_calibrate(struct ieee80211_hw *hw, char delta)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_phy *rtlphy = &(rtlpriv->phy);



	if (rtlphy->apk_done)

		return;

	return;

}



void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain)

{

	rfpath_switch(hw, bmain, false);

drivers/net/wireless/rtlwifi/rtl8188ee/phy.h

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, 
extern void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw);

extern u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw);

extern void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery);

void rtl92c_phy_ap_calibrate(struct ieee80211_hw *hw, char delta);

void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw);

void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain);

bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,

drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c

+10 −10
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
 *	2011.07.07, added by Roger.

 */



bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,

bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,

				u8 fab_version, u8 interface_type,

				struct wlan_pwr_cfg pwrcfgcmd[])

{
@@ -54,7 +54,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, 
	do {

		cmd = pwrcfgcmd[ary_idx];

		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

			 "rtl_hal_pwrseqcmdparsing(): offset(%#x), cut_msk(%#x), fab_msk(%#x),"

			 "rtl88_hal_pwrseqcmdparsing(): offset(%#x), cut_msk(%#x), fab_msk(%#x),"

			 "interface_msk(%#x), base(%#x), cmd(%#x), msk(%#x), val(%#x)\n",

			 GET_PWR_CFG_OFFSET(cmd),

			 GET_PWR_CFG_CUT_MASK(cmd),
@@ -71,11 +71,11 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, 
			switch (GET_PWR_CFG_CMD(cmd)) {

			case PWR_CMD_READ:

				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

					 "rtl_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");

					 "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_READ\n");

				break;

			case PWR_CMD_WRITE: {

				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

					 "rtl_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");

					 "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_WRITE\n");

				offset = GET_PWR_CFG_OFFSET(cmd);



					/*Read the val from system register*/
@@ -90,7 +90,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, 
				break;

			case PWR_CMD_POLLING:

				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

					 "rtl_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");

					 "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_POLLING\n");

				polling_bit = false;

				offset = GET_PWR_CFG_OFFSET(cmd);
@@ -115,7 +115,7 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, 
				break;

			case PWR_CMD_DELAY:

				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

					 "rtl_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");

					 "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_DELAY\n");

				if (GET_PWR_CFG_VALUE(cmd) == PWRSEQ_DELAY_US)

					udelay(GET_PWR_CFG_OFFSET(cmd));

				else
@@ -123,12 +123,12 @@ bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version, 
				break;

			case PWR_CMD_END:

				RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,

					 "rtl_hal_pwrseqcmdparsing(): PWR_CMD_END\n");

					 "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_END\n");

				return true;

				break;

			default:

				RT_ASSERT(false,

					  "rtl_hal_pwrseqcmdparsing(): Unknown CMD!!\n");

					  "rtl88_hal_pwrseqcmdparsing(): Unknown CMD!!\n");

				break;

			}

		}

drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct wlan_pwr_cfg { 
#define	GET_PWR_CFG_MASK(__PWR)		(__PWR.msk)

#define	GET_PWR_CFG_VALUE(__PWR)	(__PWR.value)



bool rtl_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,

bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,

				u8 fab_version, u8 interface_type,

				struct wlan_pwr_cfg pwrcfgcmd[]);