staging: rtl8192u: Move ieee80211_crypto_* declarations to ieee80211/ieee80211.h
PATCH 1/1 staging: rtl8192u: Move ieee80211_crypto_* declarations to ieee80211/ieee80211.h
Move ieee80211_crypto*_init and _exit prototype declarations from r8192U_core.c to ieee80211/ieee80211.h. This fixes the following sparse warnings:
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:203:12: warning: symbol 'ieee80211_crypto_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:223:13: warning: symbol 'ieee80211_crypto_deinit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:764:12: warning: symbol 'ieee80211_crypto_tkip_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:769:13: warning: symbol 'ieee80211_crypto_tkip_exit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:467:12: warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:472:13: warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:281:12: warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:286:13: warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it be static?
--- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 9 +++++++++ drivers/staging/rtl8192u/r8192U_core.c | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +9 -0
@@ -2445,6 +2445,15 @@ extern void ieee80211_tkip_null(void);extern void ieee80211_wep_null (void );extern void ieee80211_ccmp_null (void ); +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 ); +/* ieee80211_softmac_wx.c */ extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee,
drivers/staging/rtl8192u/r8192U_core.c +0 -10
@@ -4798,16 +4798,6 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)RT_TRACE (COMP_DOWN ,"wlan driver removed\n" ); } -/* 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 ); -static int __init rtl8192_usb_module_init (void ) {int ret;
Signature · 1 line
1.7.10.4
Quoted 7 lines · Ragnar B. Johannsson
drivers/staging/rtl8192u/ieee80211/ieee80211.h +0
-0@@ -2445,6 +2445,15 @@ extern void ieee80211_tkip_null(void);extern void ieee80211_wep_null (void );extern void ieee80211_ccmp_null (void );
drivers/staging/rtl8192u/ieee80211/ieee80211.h extern void ieee80211_tkip_null(void); · line 2456
Quoted 10 lines
drivers/staging/rtl8192u/ieee80211/ieee80211.h +9
-0+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 ); +
We don't normally put the extern here. I don't think it adds anything to the readability. Let's remove it.
regards,
dan carpenter
PATCH v2 1/1 staging: rtl8192u: Move ieee80211_crypto_* declarations to ieee80211/ieee80211.h
Move ieee80211_crypto*_init and _exit prototype declarations from r8192U_core.c to ieee80211/ieee80211.h. This fixes the following sparse warnings:
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:203:12: warning: symbol 'ieee80211_crypto_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:223:13: warning: symbol 'ieee80211_crypto_deinit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:764:12: warning: symbol 'ieee80211_crypto_tkip_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:769:13: warning: symbol 'ieee80211_crypto_tkip_exit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:467:12: warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:472:13: warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:281:12: warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it be static? drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:286:13: warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it be static?
---
Changes in v2: Remove extern, as suggested by Dan Carpenter.
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 9 +++++++++ drivers/staging/rtl8192u/r8192U_core.c | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +9 -0
@@ -2445,6 +2445,15 @@ extern void ieee80211_tkip_null(void);extern void ieee80211_wep_null (void );extern void ieee80211_ccmp_null (void ); +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 ); +/* ieee80211_softmac_wx.c */ extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee,
drivers/staging/rtl8192u/r8192U_core.c +0 -10
@@ -4798,16 +4798,6 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)RT_TRACE (COMP_DOWN ,"wlan driver removed\n" ); } -/* 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 ); -static int __init rtl8192_usb_module_init (void ) {int ret;
Signature · 1 line
1.7.10.4
Quoted 11 lines · Ragnar B. Johannsson
Move ieee80211_crypto*_init and
_exitprototype declarations fromr8192U_core.ctoieee80211/ieee80211.h. This fixes the following sparse warnings:
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:203:12: warning: symbol 'ieee80211_crypto_init' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c:223:13: warning: symbol 'ieee80211_crypto_deinit' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:764:12: warning: symbol 'ieee80211_crypto_tkip_init' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c:769:13: warning: symbol 'ieee80211_crypto_tkip_exit' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:467:12: warning: symbol 'ieee80211_crypto_ccmp_init' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c:472:13: warning: symbol 'ieee80211_crypto_ccmp_exit' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:281:12: warning: symbol 'ieee80211_crypto_wep_init' was not declared. Should it be static?drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c:286:13: warning: symbol 'ieee80211_crypto_wep_exit' was not declared. Should it be static?
Quoted 3 lines
Signed-off-by Ragnar B. Johannsson <[email protected]>---
Changes in v2: Remove extern, as suggested by Dan Carpenter.
Fantastic. Thanks!
regards,
dan carpenter