From f2ac3b297d170a431b2bac48a35b48f6ca223a64 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Sun, 2 Oct 2011 10:14:30 -0700 Subject: [PATCH] staging: brcm80211: reduced softmac sparse warnings By declaring certain variables static. One unused array induced a warning, array was deleted. Reviewed-by: Arend van Spriel Reviewed-by: Pieter-Paul Giesberts Signed-off-by: Franky Lin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/channel.c | 4 +- drivers/staging/brcm80211/brcmsmac/main.c | 2 +- .../staging/brcm80211/brcmsmac/phy/phy_n.c | 48 +++++++++---------- .../brcm80211/brcmsmac/phy/phytbl_lcn.c | 4 -- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/channel.c b/drivers/staging/brcm80211/brcmsmac/channel.c index a9defe21b7dd..02bb7955d6ff 100644 --- a/drivers/staging/brcm80211/brcmsmac/channel.c +++ b/drivers/staging/brcm80211/brcmsmac/channel.c @@ -197,7 +197,7 @@ static const struct brcms_chanvec chanvec_none = { }; /* All 2.4 GHz HW channels */ -const struct brcms_chanvec chanvec_all_2G = { +static const struct brcms_chanvec chanvec_all_2G = { {0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -205,7 +205,7 @@ const struct brcms_chanvec chanvec_all_2G = { }; /* All 5 GHz HW channels */ -const struct brcms_chanvec chanvec_all_5G = { +static const struct brcms_chanvec chanvec_all_5G = { {0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x20, 0x22, 0x22, 0x00, 0x00, 0x11, diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c index f8bc42f34a5e..ac5a52a0e788 100644 --- a/drivers/staging/brcm80211/brcmsmac/main.c +++ b/drivers/staging/brcm80211/brcmsmac/main.c @@ -423,7 +423,7 @@ uint brcm_msg_level = #endif /* BCMDBG */ /* TX FIFO number to WME/802.1E Access Category */ -const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE }; +static const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE }; /* WME/802.1E Access Category to TX FIFO number */ static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 }; diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c index 93ac12fc81c8..4023af138125 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c @@ -7762,7 +7762,7 @@ static const struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev8[] = { 0x0424} }; -struct radio_regs regs_2055[] = { +static struct radio_regs regs_2055[] = { {0x02, 0x80, 0x80, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0x27, 0x27, 0, 0}, @@ -7991,7 +7991,7 @@ struct radio_regs regs_2055[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_SYN_2056[] = { +static struct radio_regs regs_SYN_2056[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8176,7 +8176,7 @@ struct radio_regs regs_SYN_2056[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_TX_2056[] = { +static struct radio_regs regs_TX_2056[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8325,7 +8325,7 @@ struct radio_regs regs_TX_2056[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_RX_2056[] = { +static struct radio_regs regs_RX_2056[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8476,7 +8476,7 @@ struct radio_regs regs_RX_2056[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_SYN_2056_A1[] = { +static struct radio_regs regs_SYN_2056_A1[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8661,7 +8661,7 @@ struct radio_regs regs_SYN_2056_A1[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_TX_2056_A1[] = { +static struct radio_regs regs_TX_2056_A1[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8810,7 +8810,7 @@ struct radio_regs regs_TX_2056_A1[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_RX_2056_A1[] = { +static struct radio_regs regs_RX_2056_A1[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -8961,7 +8961,7 @@ struct radio_regs regs_RX_2056_A1[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_SYN_2056_rev5[] = { +static struct radio_regs regs_SYN_2056_rev5[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9146,7 +9146,7 @@ struct radio_regs regs_SYN_2056_rev5[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_TX_2056_rev5[] = { +static struct radio_regs regs_TX_2056_rev5[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9303,7 +9303,7 @@ struct radio_regs regs_TX_2056_rev5[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_RX_2056_rev5[] = { +static struct radio_regs regs_RX_2056_rev5[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9454,7 +9454,7 @@ struct radio_regs regs_RX_2056_rev5[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_SYN_2056_rev6[] = { +static struct radio_regs regs_SYN_2056_rev6[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9639,7 +9639,7 @@ struct radio_regs regs_SYN_2056_rev6[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_TX_2056_rev6[] = { +static struct radio_regs regs_TX_2056_rev6[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9796,7 +9796,7 @@ struct radio_regs regs_TX_2056_rev6[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_RX_2056_rev6[] = { +static struct radio_regs regs_RX_2056_rev6[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -9947,7 +9947,7 @@ struct radio_regs regs_RX_2056_rev6[] = { {0xFFFF, 0, 0, 0, 0} }; -struct radio_regs regs_SYN_2056_rev7[] = { +static struct radio_regs regs_SYN_2056_rev7[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -10132,7 +10132,7 @@ struct radio_regs regs_SYN_2056_rev7[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_TX_2056_rev7[] = { +static struct radio_regs regs_TX_2056_rev7[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -10289,7 +10289,7 @@ struct radio_regs regs_TX_2056_rev7[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_RX_2056_rev7[] = { +static struct radio_regs regs_RX_2056_rev7[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -10440,7 +10440,7 @@ struct radio_regs regs_RX_2056_rev7[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_SYN_2056_rev8[] = { +static struct radio_regs regs_SYN_2056_rev8[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -10625,7 +10625,7 @@ struct radio_regs regs_SYN_2056_rev8[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_TX_2056_rev8[] = { +static struct radio_regs regs_TX_2056_rev8[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -10782,7 +10782,7 @@ struct radio_regs regs_TX_2056_rev8[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_regs regs_RX_2056_rev8[] = { +static struct radio_regs regs_RX_2056_rev8[] = { {0x02, 0, 0, 0, 0}, {0x03, 0, 0, 0, 0}, {0x04, 0, 0, 0, 0}, @@ -11426,7 +11426,7 @@ static const struct radio_regs regs_RX_2056_rev11[] = { {0xFFFF, 0, 0, 0, 0}, }; -struct radio_20xx_regs regs_2057_rev4[] = { +static struct radio_20xx_regs regs_2057_rev4[] = { {0x00, 0x84, 0}, {0x01, 0, 0}, {0x02, 0x60, 0}, @@ -11816,7 +11816,7 @@ struct radio_20xx_regs regs_2057_rev4[] = { {0xFFFF, 0, 0}, }; -struct radio_20xx_regs regs_2057_rev5[] = { +static struct radio_20xx_regs regs_2057_rev5[] = { {0x00, 0, 1}, {0x01, 0x57, 1}, {0x02, 0x20, 1}, @@ -12148,7 +12148,7 @@ struct radio_20xx_regs regs_2057_rev5[] = { {0xFFFF, 0, 0} }; -struct radio_20xx_regs regs_2057_rev5v1[] = { +static struct radio_20xx_regs regs_2057_rev5v1[] = { {0x00, 0x15, 1}, {0x01, 0x57, 1}, {0x02, 0x20, 1}, @@ -12480,7 +12480,7 @@ struct radio_20xx_regs regs_2057_rev5v1[] = { {0xFFFF, 0, 0} }; -struct radio_20xx_regs regs_2057_rev7[] = { +static struct radio_20xx_regs regs_2057_rev7[] = { {0x00, 0, 1}, {0x01, 0x57, 1}, {0x02, 0x20, 1}, @@ -12896,7 +12896,7 @@ struct radio_20xx_regs regs_2057_rev7[] = { {0xFFFF, 0, 0} }; -struct radio_20xx_regs regs_2057_rev8[] = { +static struct radio_20xx_regs regs_2057_rev8[] = { {0x00, 0x8, 1}, {0x01, 0x57, 1}, {0x02, 0x20, 1}, diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c index 15c5ffcc30ab..622c01ca72c5 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c @@ -1611,10 +1611,6 @@ const u32 dot11lcnphytbl_rx_gain_info_sz_rev0 = sizeof(dot11lcnphytbl_rx_gain_info_rev0) / sizeof(dot11lcnphytbl_rx_gain_info_rev0[0]); -static const u32 dot11lcnphytbl_rx_gain_info_sz_rev1 = - sizeof(dot11lcnphytbl_rx_gain_info_rev1) / - sizeof(dot11lcnphytbl_rx_gain_info_rev1[0]); - const u32 dot11lcnphytbl_rx_gain_info_2G_rev2_sz = sizeof(dot11lcnphytbl_rx_gain_info_2G_rev2) / sizeof(dot11lcnphytbl_rx_gain_info_2G_rev2[0]);