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

Commit 7101f404 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: Fix warnings on parisc arch 



In "Build regressions/improvements in v3.0-rc2", Geert Uytterhoeven
reports a number of warnings that occur for parisc builds of rtlwifi
and dependents.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e3ae0cac

drivers/net/wireless/rtlwifi/core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -650,7 +650,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

		RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,

			 ("BSS_CHANGED_HT\n"));

			 ("BSS_CHANGED_HT\n"));

		rcu_read_lock();

		rcu_read_lock();

		sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);

		sta = get_sta(hw, vif, bss_conf->bssid);

		if (sta) {

		if (sta) {

			if (sta->ht_cap.ampdu_density >

			if (sta->ht_cap.ampdu_density >

			    mac->current_ampdu_density)

			    mac->current_ampdu_density)
@@ -685,7 +685,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, 
		rtlpriv->cfg->ops->set_network_type(hw, vif->type);

		rtlpriv->cfg->ops->set_network_type(hw, vif->type);





		rcu_read_lock();

		rcu_read_lock();

		sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);

		sta = get_sta(hw, vif, bss_conf->bssid);

		if (!sta) {

		if (!sta) {

			rcu_read_unlock();

			rcu_read_unlock();

			goto out;

			goto out;

drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -670,7 +670,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw 
	u8 ofdm_index[2], cck_index = 0, ofdm_index_old[2], cck_index_old = 0;

	u8 ofdm_index[2], cck_index = 0, ofdm_index_old[2], cck_index_old = 0;

	int i;

	int i;

	bool is2t = IS_92C_SERIAL(rtlhal->version);

	bool is2t = IS_92C_SERIAL(rtlhal->version);

	u8 txpwr_level[2] = {0, 0};

	s8 txpwr_level[2] = {0, 0};

	u8 ofdm_min_index = 6, rf;

	u8 ofdm_min_index = 6, rf;





	rtlpriv->dm.txpower_trackinginit = true;

	rtlpriv->dm.txpower_trackinginit = true;

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, 
{

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct phy_sts_cck_8192s_t *cck_buf;

	struct phy_sts_cck_8192s_t *cck_buf;

	s8 rx_pwr_all, rx_pwr[4];

	s8 rx_pwr_all = 0, rx_pwr[4];

	u8 evm, pwdb_all, rf_rx_num = 0;

	u8 evm, pwdb_all, rf_rx_num = 0;

	u8 i, max_spatial_stream;

	u8 i, max_spatial_stream;

	u32 rssi, total_rssi = 0;

	u32 rssi, total_rssi = 0;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -516,7 +516,7 @@ static u8 _rtl92se_rf_onoff_detect(struct ieee80211_hw *hw) 
	mdelay(10);

	mdelay(10);





	/* check GPIO3 */

	/* check GPIO3 */

	u1tmp = rtl_read_byte(rtlpriv, GPIO_IN);

	u1tmp = rtl_read_byte(rtlpriv, GPIO_IN_SE);

	retval = (u1tmp & HAL_8192S_HW_GPIO_OFF_BIT) ? ERFON : ERFOFF;

	retval = (u1tmp & HAL_8192S_HW_GPIO_OFF_BIT) ? ERFON : ERFOFF;





	return retval;

	return retval;

drivers/net/wireless/rtlwifi/rtl8192se/reg.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -248,12 +248,8 @@ 
#define	PSTIME					0x02E0

#define	PSTIME					0x02E0

#define	TIMER0					0x02E4

#define	TIMER0					0x02E4

#define	TIMER1					0x02E8

#define	TIMER1					0x02E8

#define	GPIO_CTRL				0x02EC

#define	GPIO_IN_SE				0x02EC

#define	GPIO_IN					0x02EC

#define	GPIO_OUT				0x02ED

#define	GPIO_IO_SEL				0x02EE

#define	GPIO_IO_SEL				0x02EE

#define	GPIO_MOD				0x02EF

#define	GPIO_INTCTRL				0x02F0

#define	MAC_PINMUX_CFG				0x02F1

#define	MAC_PINMUX_CFG				0x02F1

#define	LEDCFG					0x02F2

#define	LEDCFG					0x02F2

#define	PHY_REG					0x02F3

#define	PHY_REG					0x02F3