[PATCH] zd1211rw: Mark some data const

This is a backport of Helge Deller's recent patch for wireless-dev.git

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index e6d604b01dc2c380f4e2bf7177d94da7355e6ad6..4ddc2cb60d2b2dadcb0699393fca385c5f4d981d 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -23,7 +23,7 @@
 #include "zd_ieee80211.h"
 #include "zd_chip.h"
 
-static const char *rfs[] = {
+static const char * const rfs[] = {
        [0]             = "unknown RF0",
        [1]             = "unknown RF1",
        [UW2451_RF]     = "UW2451_RF",

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index a289f95187ec5cd8ab9fc8597e11cd5b9121ddf4..bd07c9bce8c85e041e8861e3acb8eade2f1cef48 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -183,12 +183,12 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
        const u32 *rv = chan_rv[channel-1];
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
-       struct zd_ioreq16 ioreqs_1[] = {
+       static const struct zd_ioreq16 ioreqs_1[] = {
                { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
                { CR38,  0x38 }, { CR136, 0xdf },
        };
 
-       struct zd_ioreq16 ioreqs_2[] = {
+       static const struct zd_ioreq16 ioreqs_2[] = {
                /* PLL_ON */
                { CR251, 0x3f },
                { CR203, 0x06 }, { CR240, 0x08 },

diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index 58247271cc240abc4bf31d4cd8dc26404dfa107e..2d736bdf707c6329358f3568e08a5c62df68e230 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -21,7 +21,7 @@
 #include "zd_usb.h"
 #include "zd_chip.h"
 
-static u32 rf2959_table[][2] = {
+static const u32 rf2959_table[][2] = {
        RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
        RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
        RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
 static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
 {
        int i, r;
-       u32 *rv = rf2959_table[channel-1];
+       const u32 *rv = rf2959_table[channel-1];
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
        for (i = 0; i < 2; i++) {