[PATCH] staging/rtl8187se fix sparse complaints

From: Jake Edge
Date: Sun Apr 13 2014 - 13:11:03 EST



Fix the following sparse complaints:

drivers/staging/rtl8187se//r8180_wx.c:1399:24: warning: symbol
'r8180_wx_handlers_def' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt.c:201:5: warning:
symbol 'ieee80211_crypto_init' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt.c:222:6: warning:
symbol 'ieee80211_crypto_deinit' was not declared. Should it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_ccmp.c:446:5:
warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should
it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_ccmp.c:452:6:
warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should
it be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_wep.c:264:5:
warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it
be static?

drivers/staging/rtl8187se//ieee80211/ieee80211_crypt_wep.c:269:6:
warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it
be static?

by adding an include file into source files and moving some
declarations around into the proper header files.

Signed-off-by: Jake Edge <jake@xxxxxxxxx>
---

Against next-20140411

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
index 0b4ea43..8fe7873 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.h
@@ -83,4 +83,13 @@ void ieee80211_crypt_deinit_handler(unsigned long);
void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
struct ieee80211_crypt_data **crypt);

+/* fun with the built-in ieee80211 stack... */
+int ieee80211_crypto_init(void);
+void ieee80211_crypto_deinit(void);
+int ieee80211_crypto_tkip_init(void);
+void ieee80211_crypto_tkip_exit(void);
+int ieee80211_crypto_ccmp_init(void);
+void ieee80211_crypto_ccmp_exit(void);
+int ieee80211_crypto_wep_init(void);
+void ieee80211_crypto_wep_exit(void);
#endif
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 9f931db..cf510b6 100644
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -629,12 +629,3 @@ bool MgntActSet_RF_State(struct net_device *dev, enum rt_rf_power_state StateToS

#endif

-/* fun with the built-in ieee80211 stack... */
-extern int ieee80211_crypto_init(void);
-extern void ieee80211_crypto_deinit(void);
-extern int ieee80211_crypto_tkip_init(void);
-extern void ieee80211_crypto_tkip_exit(void);
-extern int ieee80211_crypto_ccmp_init(void);
-extern void ieee80211_crypto_ccmp_exit(void);
-extern int ieee80211_crypto_wep_init(void);
-extern void ieee80211_crypto_wep_exit(void);
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index a6022d4..cbdff00 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -47,6 +47,7 @@
#include "r8180_dm.h"

#include "ieee80211/dot11d.h"
+#include "ieee80211/ieee80211_crypt.h"

static struct pci_device_id rtl8180_pci_id_tbl[] = {
{
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index b552491..57bf01f 100644
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -20,6 +20,7 @@

#include "r8180.h"
#include "r8180_hw.h"
+#include "r8180_wx.h"

#include <net/iw_handler.h>
#include "ieee80211/dot11d.h"


--
Jake Edge - jake@xxxxxxxxx - http://www.edge2.net
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/