3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6facb8ab05d..afbfdf0ee6e 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -655,7 +655,8 @@ static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */
-static void b43_nphy_write_clip_detection(struct b43_wldev *dev, u16 *clip_st)
+static void b43_nphy_write_clip_detection(struct b43_wldev *dev,
+                                          const u16 *clip_st)
 {
         b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]);
         b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]);
@@ -731,7 +732,7 @@ static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable)
         struct b43_phy_n *nphy = phy->n;
 
         if (enable) {
-                u16 clip[] = { 0xFFFF, 0xFFFF };
+                static const u16 clip[] = { 0xFFFF, 0xFFFF };
                 if (nphy->deaf_count++ == 0) {
                         nphy->classifier_state = b43_nphy_classifier(dev, 0, 0);
                         b43_nphy_classifier(dev, 0x7, 0);
@@ -843,7 +844,7 @@ static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)
         u16 data[4];
         s16 gain[2];
         u16 minmax[2];
-        u16 lna_gain[4] = { -2, 10, 19, 25 };
+        static const u16 lna_gain[4] = { -2, 10, 19, 25 };
 
         if (nphy->hang_avoid)
                 b43_nphy_stay_in_carrier_search(dev, 1);
@@ -2299,7 +2300,7 @@ static void b43_nphy_int_pa_set_tx_dig_filters(struct b43_wldev *dev)
 {
         int i, j;
         /* B43_NPHY_TXF_20CO_S0A1, B43_NPHY_TXF_40CO_S0A1, unknown */
-        u16 offset[] = { 0x186, 0x195, 0x2C5 };
+        static const u16 offset[] = { 0x186, 0x195, 0x2C5 };
 
         for (i = 0; i < 3; i++)
                 for (j = 0; j < 15; j++)
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 56f4ca7e49d..d39f449a9bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -116,7 +116,7 @@ void iwl3945_disable_events(struct iwl_priv *priv)
         u32 base;               /* SRAM address of event log header */
         u32 disable_ptr;        /* SRAM address of event-disable bitmap array */
         u32 array_size;         /* # of u32 entries in array */
-        u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
+        static const u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
                 0x00000000,     /*   31 -    0  Event id numbers */
                 0x00000000,     /*   63 -   32 */
                 0x00000000,     /*   95 -   64 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 881475cf5ad..c4491f7641f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1996,7 +1996,7 @@ static void iwlagn_set_kill_ack_msk(struct iwl_priv *priv,
                                      struct iwl_bt_uart_msg *uart_msg)
 {
         u8 kill_ack_msk;
-        __le32 bt_kill_ack_msg[2] = {
+        static const __le32 bt_kill_ack_msg[2] = {
                         cpu_to_le32(0xFFFFFFF), cpu_to_le32(0xFFFFFC00) };
 
         kill_ack_msk = (((BT_UART_MSG_FRAME3A2DP_MSK |
@@ -2280,7 +2280,7 @@ static const char *get_csr_string(int cmd)
 void iwl_dump_csr(struct iwl_priv *priv)
 {
         int i;
-        u32 csr_tbl[] = {
+        static const u32 csr_tbl[] = {
                 CSR_HW_IF_CONFIG_REG,
                 CSR_INT_COALESCING,
                 CSR_INT,
@@ -2339,7 +2339,7 @@ int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display)
         int pos = 0;
         size_t bufsz = 0;
 #endif
-        u32 fh_tbl[] = {
+        static const u32 fh_tbl[] = {
                 FH_RSCSR_CHNL0_STTS_WPTR_REG,
                 FH_RSCSR_CHNL0_RBDCB_BASE_REG,
                 FH_RSCSR_CHNL0_WPTR,