Skip to contentSkip to conversation

staging: rtl8821ae: fix sparse warnings in sw.c

PATCH New Konrad Zapalowicz 1 participant 3 messages May 17, 2014 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8821ae: fix sparse warnings in sw.c

This patch set fixes sparse warnings in sw.c file of rtl8821ae driver. In particular it deals with:
1) double const definition
2) missing 'static' for a few local symbols

Konrad Zapalowicz (2):
staging: rtl8821ae: fix double const in sw.c
staging: rtl8821ae: fix not declared symbols should be static in sw.c

 drivers/staging/rtl8821ae/rtl8821ae/sw.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 staging: rtl8821ae: fix double const in sw.c

This commit fixes the following sparse warning:

drivers/staging/rtl8821ae/rtl8821ae/sw.c:
- 449:14: warning: duplicate const

---
 drivers/staging/rtl8821ae/rtl8821ae/sw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8821ae/rtl8821ae/sw.c +1 -1
index a8d1755..c24d426 100644
@@ -446,7 +446,7 @@ MODULE_PARM_DESC(ips, "using no link power save (default 1 is open)\n");
 MODULE_PARM_DESC(fwlps, "using linked fw control power save (default 1 is open)\n");
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-static const SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
+static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
 #endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/2 staging: rtl8821ae: fix not declared symbols should be static in sw.c

This commit fixes the following sparse warnings:

drivers/staging/rtl8821ae/rtl8821ae/sw.c:
- 48:6: warning: symbol 'rtl8821ae_init_aspm_vars' was not declared. Should it be static?
- 228:5: warning: symbol 'rtl8812ae_rx_command_packet_handler' was not declared. Should it be static?
- 263:20: warning: symbol 'rtl8821ae_hal_ops' was not declared. Should it be static?
- 314:23: warning: symbol 'rtl8821ae_mod_params' was not declared. Should it be static?
- 321:20: warning: symbol 'rtl8821ae_hal_cfg' was not declared. Should it be static?

All of this symbols are local, that is there are no references to them in the other files from this driver.

---
 drivers/staging/rtl8821ae/rtl8821ae/sw.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8821ae/rtl8821ae/sw.c +5 -5
index c24d426..e90806e 100644
@@ -45,7 +45,7 @@
 #include "hal_btc.h"
 #include "../btcoexist/rtl_btc.h"
 
-void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw)
+static void rtl8821ae_init_aspm_vars(struct ieee80211_hw *hw)
 {
 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
@@ -225,7 +225,7 @@ void rtl8821ae_deinit_sw_vars(struct ieee80211_hw *hw)
 	//printk("<=========rtl8821ae_deinit_sw_vars().\n");
 }
 
-u32 rtl8812ae_rx_command_packet_handler(
+static u32 rtl8812ae_rx_command_packet_handler(
 	struct ieee80211_hw *hw,
 	struct rtl_stats status,
 	struct sk_buff *skb
@@ -260,7 +260,7 @@ bool rtl8821ae_get_btc_status(void)
 	return true;
 }
 
-struct rtl_hal_ops rtl8821ae_hal_ops = {
+static struct rtl_hal_ops rtl8821ae_hal_ops = {
 	.init_sw_vars = rtl8821ae_init_sw_vars,
 	.deinit_sw_vars = rtl8821ae_deinit_sw_vars,
 	.read_eeprom_info = rtl8821ae_read_eeprom_info,
@@ -311,14 +311,14 @@ struct rtl_hal_ops rtl8821ae_hal_ops = {
 	.rx_command_packet_handler = rtl8812ae_rx_command_packet_handler,
 };
 
-struct rtl_mod_params rtl8821ae_mod_params = {
+static struct rtl_mod_params rtl8821ae_mod_params = {
 	.sw_crypto = false,
 	.b_inactiveps = false,//true,
 	.b_swctrl_lps = false,
 	.b_fwctrl_lps = false, //true,
 };
 
-struct rtl_hal_cfg rtl8821ae_hal_cfg = {
+static struct rtl_hal_cfg rtl8821ae_hal_cfg = {
 	.bar_id = 2,
 	.write_readback = true,
 	.name = "rtl8821ae_pci",
Signature · 1 line
1.8.1.2