Skip to content

L
linux
Commit df8501c9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: brcm80211: remove CONST definition 

Use 'const', it's the correct thing to do.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3deea904
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 170 deletions
drivers/staging/brcm80211/include/bcmdefs.h
View file @ df8501c9
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#define BCMOVERLAY1DATA(_sym) _sym #define BCMOVERLAY1DATA(_sym) _sym
#define BCMOVERLAY1FN(_fn) _fn #define BCMOVERLAY1FN(_fn) _fn
#define BCMOVERLAYERRFN(_fn) _fn #define BCMOVERLAYERRFN(_fn) _fn
#define CONST const
#ifdef mips #ifdef mips
#define BCMFASTPATH __attribute__ ((__section__(".text.fastpath"))) #define BCMFASTPATH __attribute__ ((__section__(".text.fastpath")))
#else #else
......
drivers/staging/brcm80211/phy/wlc_phy_lcn.c
View file @ df8501c9
...@@ -544,11 +544,11 @@ static const s8 lcnphy_gain_index_offset_for_rssi[] = { ...@@ -544,11 +544,11 @@ static const s8 lcnphy_gain_index_offset_for_rssi[] = {
-2 -2
}; };
extern CONST u8 spur_tbl_rev0[]; extern const u8 spur_tbl_rev0[];
extern CONST uint32 dot11lcnphytbl_rx_gain_info_sz_rev1; extern const uint32 dot11lcnphytbl_rx_gain_info_sz_rev1;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_rev1[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_rev1[];
extern CONST dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_bt_epa; extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_bt_epa;
extern CONST dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_bt_epa_p250; extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_bt_epa_p250;
typedef struct _chan_info_2064_lcnphy { typedef struct _chan_info_2064_lcnphy {
uint chan; uint chan;
...@@ -1049,7 +1049,7 @@ void wlc_lcnphy_read_table(phy_info_t *pi, phytbl_info_t *pti) ...@@ -1049,7 +1049,7 @@ void wlc_lcnphy_read_table(phy_info_t *pi, phytbl_info_t *pti)
static void static void
wlc_lcnphy_common_read_table(phy_info_t *pi, uint32 tbl_id, wlc_lcnphy_common_read_table(phy_info_t *pi, uint32 tbl_id,
CONST void *tbl_ptr, uint32 tbl_len, const void *tbl_ptr, uint32 tbl_len,
uint32 tbl_width, uint32 tbl_offset) uint32 tbl_width, uint32 tbl_offset)
{ {
phytbl_info_t tab; phytbl_info_t tab;
...@@ -1063,7 +1063,7 @@ wlc_lcnphy_common_read_table(phy_info_t *pi, uint32 tbl_id, ...@@ -1063,7 +1063,7 @@ wlc_lcnphy_common_read_table(phy_info_t *pi, uint32 tbl_id,
static void static void
wlc_lcnphy_common_write_table(phy_info_t *pi, uint32 tbl_id, wlc_lcnphy_common_write_table(phy_info_t *pi, uint32 tbl_id,
CONST void *tbl_ptr, uint32 tbl_len, const void *tbl_ptr, uint32 tbl_len,
uint32 tbl_width, uint32 tbl_offset) uint32 tbl_width, uint32 tbl_offset)
{ {
...@@ -1975,13 +1975,13 @@ wlc_lcnphy_tx_iqlo_cal(phy_info_t *pi, ...@@ -1975,13 +1975,13 @@ wlc_lcnphy_tx_iqlo_cal(phy_info_t *pi,
write_phy_reg(pi, 0x93d, 0xc0); write_phy_reg(pi, 0x93d, 0xc0);
wlc_lcnphy_common_write_table(pi, LCNPHY_TBL_ID_IQLOCAL, wlc_lcnphy_common_write_table(pi, LCNPHY_TBL_ID_IQLOCAL,
(CONST void *) (const void *)
lcnphy_iqcal_loft_gainladder, lcnphy_iqcal_loft_gainladder,
ARRAYSIZE(lcnphy_iqcal_loft_gainladder), ARRAYSIZE(lcnphy_iqcal_loft_gainladder),
16, 0); 16, 0);
wlc_lcnphy_common_write_table(pi, LCNPHY_TBL_ID_IQLOCAL, wlc_lcnphy_common_write_table(pi, LCNPHY_TBL_ID_IQLOCAL,
(CONST void *)lcnphy_iqcal_ir_gainladder, (const void *)lcnphy_iqcal_ir_gainladder,
ARRAYSIZE(lcnphy_iqcal_ir_gainladder), 16, ARRAYSIZE(lcnphy_iqcal_ir_gainladder), 16,
32); 32);
......
drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h
View file @ df8501c9
...@@ -16,24 +16,24 @@ ...@@ -16,24 +16,24 @@
typedef phytbl_info_t dot11lcnphytbl_info_t; typedef phytbl_info_t dot11lcnphytbl_info_t;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_rev0[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_rev0[];
extern CONST uint32 dot11lcnphytbl_rx_gain_info_sz_rev0; extern const uint32 dot11lcnphytbl_rx_gain_info_sz_rev0;
extern CONST dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313; extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313;
extern CONST dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_epa; extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_epa;
extern CONST dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_epa_combo; extern const dot11lcnphytbl_info_t dot11lcn_sw_ctrl_tbl_info_4313_epa_combo;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_info_rev0[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_info_rev0[];
extern CONST uint32 dot11lcnphytbl_info_sz_rev0; extern const uint32 dot11lcnphytbl_info_sz_rev0;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_2G_rev2[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_2G_rev2[];
extern CONST uint32 dot11lcnphytbl_rx_gain_info_2G_rev2_sz; extern const uint32 dot11lcnphytbl_rx_gain_info_2G_rev2_sz;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_5G_rev2[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_5G_rev2[];
extern CONST uint32 dot11lcnphytbl_rx_gain_info_5G_rev2_sz; extern const uint32 dot11lcnphytbl_rx_gain_info_5G_rev2_sz;
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_2G_rev2[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_2G_rev2[];
extern CONST dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_5G_rev2[]; extern const dot11lcnphytbl_info_t dot11lcnphytbl_rx_gain_info_extlna_5G_rev2[];
typedef struct { typedef struct {
unsigned char gm; unsigned char gm;
...@@ -43,7 +43,7 @@ typedef struct { ...@@ -43,7 +43,7 @@ typedef struct {
unsigned char bb_mult; unsigned char bb_mult;
} lcnphy_tx_gain_tbl_entry; } lcnphy_tx_gain_tbl_entry;
extern CONST lcnphy_tx_gain_tbl_entry dot11lcnphy_2GHz_gaintable_rev0[]; extern const lcnphy_tx_gain_tbl_entry dot11lcnphy_2GHz_gaintable_rev0[];
extern CONST lcnphy_tx_gain_tbl_entry dot11lcnphy_2GHz_extPA_gaintable_rev0[]; extern const lcnphy_tx_gain_tbl_entry dot11lcnphy_2GHz_extPA_gaintable_rev0[];
extern CONST lcnphy_tx_gain_tbl_entry dot11lcnphy_5GHz_gaintable_rev0[]; extern const lcnphy_tx_gain_tbl_entry dot11lcnphy_5GHz_gaintable_rev0[];
drivers/staging/brcm80211/phy/wlc_phytbl_n.h
View file @ df8501c9
...@@ -18,22 +18,22 @@ ...@@ -18,22 +18,22 @@
typedef phytbl_info_t mimophytbl_info_t; typedef phytbl_info_t mimophytbl_info_t;
extern CONST mimophytbl_info_t mimophytbl_info_rev0[], extern const mimophytbl_info_t mimophytbl_info_rev0[],
mimophytbl_info_rev0_volatile[]; mimophytbl_info_rev0_volatile[];
extern CONST uint32 mimophytbl_info_sz_rev0, mimophytbl_info_sz_rev0_volatile; extern const uint32 mimophytbl_info_sz_rev0, mimophytbl_info_sz_rev0_volatile;
extern CONST mimophytbl_info_t mimophytbl_info_rev3[], extern const mimophytbl_info_t mimophytbl_info_rev3[],
mimophytbl_info_rev3_volatile[], mimophytbl_info_rev3_volatile1[], mimophytbl_info_rev3_volatile[], mimophytbl_info_rev3_volatile1[],
mimophytbl_info_rev3_volatile2[], mimophytbl_info_rev3_volatile3[]; mimophytbl_info_rev3_volatile2[], mimophytbl_info_rev3_volatile3[];
extern CONST uint32 mimophytbl_info_sz_rev3, mimophytbl_info_sz_rev3_volatile, extern const uint32 mimophytbl_info_sz_rev3, mimophytbl_info_sz_rev3_volatile,
mimophytbl_info_sz_rev3_volatile1, mimophytbl_info_sz_rev3_volatile2, mimophytbl_info_sz_rev3_volatile1, mimophytbl_info_sz_rev3_volatile2,
mimophytbl_info_sz_rev3_volatile3; mimophytbl_info_sz_rev3_volatile3;
extern CONST uint32 noise_var_tbl_rev3[]; extern const uint32 noise_var_tbl_rev3[];
extern CONST mimophytbl_info_t mimophytbl_info_rev7[]; extern const mimophytbl_info_t mimophytbl_info_rev7[];
extern CONST uint32 mimophytbl_info_sz_rev7; extern const uint32 mimophytbl_info_sz_rev7;
extern CONST uint32 noise_var_tbl_rev7[]; extern const uint32 noise_var_tbl_rev7[];
extern CONST mimophytbl_info_t mimophytbl_info_rev16[]; extern const mimophytbl_info_t mimophytbl_info_rev16[];
extern CONST uint32 mimophytbl_info_sz_rev16; extern const uint32 mimophytbl_info_sz_rev16;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7