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: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index d2ec2535aa3c7145772e3a5a309b9f4172c41a74..605514bdd24e774ab0d9f9e7cb9298acd91f7c98 100644 (file)
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -650,7 +650,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                         ("BSS_CHANGED_HT\n"));
                rcu_read_lock();
-               sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);
+               sta = get_sta(hw, vif, bss_conf->bssid);
                if (sta) {
                        if (sta->ht_cap.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);
 
                rcu_read_lock();
-               sta = get_sta(hw, vif, (u8 *)bss_conf->bssid);
+               sta = get_sta(hw, vif, bss_conf->bssid);
                if (!sta) {
                        rcu_read_unlock();
                        goto out;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 97183829b9be849fc96666ff0e106c5045e30414..57d52e914f1fbdcf45dc6b1165f98160cf2797b9 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -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;
        int i;
        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;
 
        rtlpriv->dm.txpower_trackinginit = true;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 2492cc234c03b2ff953af7ed1125793dbb8b6cd4..be375214ad9ed37cc998450f933ed2e60de8e8fb 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -225,7 +225,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        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 i, max_spatial_stream;
        u32 rssi, total_rssi = 0;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 35dd12d0dcf3ef371cbe2e99009fbff597d8f7ff..5fab47b2218e9cdc51da01b4844c7ab0ca8b5c56 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -516,7 +516,7 @@ static u8 _rtl92se_rf_onoff_detect(struct ieee80211_hw *hw)
        mdelay(10);
 
        /* 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;
 
        return retval;

diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
index 0116eaddbfac5d78eb13fd880930b74506dc2082..ea32ef2d40981405bc69c869426461165905b8b3 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/reg.h
@@ -248,12 +248,8 @@
 #define        PSTIME                                  0x02E0
 #define        TIMER0                                  0x02E4
 #define        TIMER1                                  0x02E8
-#define        GPIO_CTRL                               0x02EC
-#define        GPIO_IN                                 0x02EC
-#define        GPIO_OUT                                0x02ED
+#define        GPIO_IN_SE                              0x02EC
 #define        GPIO_IO_SEL                             0x02EE
-#define        GPIO_MOD                                0x02EF
-#define        GPIO_INTCTRL                            0x02F0
 #define        MAC_PINMUX_CFG                          0x02F1
 #define        LEDCFG                                  0x02F2
 #define        PHY_REG                                 0x02F3

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 9d003e0864f53f65a2358be644f400368d64088e..fcf2c9f5437d844c72f16da757b278e8d8444e7e 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1983,7 +1983,7 @@ static inline u16 rtl_get_tid(struct sk_buff *skb)
 
 static inline struct ieee80211_sta *get_sta(struct ieee80211_hw *hw,
                                            struct ieee80211_vif *vif,
-                                           u8 *bssid)
+                                           const u8 *bssid)
 {
        return ieee80211_find_sta(vif, bssid);
 }