aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-03-25 19:59:18 -0400
committerJeff Garzik <jeff@garzik.org>2007-04-28 11:01:01 -0400
commitd2d7c052106ebee75952da4dd547f40a1673d9e0 (patch)
tree8b7eb14e23bb918fb49f60518ad20920b300c32e
parent85d32e7b0ea53a11d2a4018d8ad2605052778df7 (diff)
[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>
-rw-r--r--drivers/net/wireless/zd1211rw/zd_rf.c2
-rw-r--r--drivers/net/wireless/zd1211rw/zd_rf_al7230b.c4
-rw-r--r--drivers/net/wireless/zd1211rw/zd_rf_rf2959.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index e6d604b01dc2..4ddc2cb60d2b 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -23,7 +23,7 @@
23#include "zd_ieee80211.h" 23#include "zd_ieee80211.h"
24#include "zd_chip.h" 24#include "zd_chip.h"
25 25
26static const char *rfs[] = { 26static const char * const rfs[] = {
27 [0] = "unknown RF0", 27 [0] = "unknown RF0",
28 [1] = "unknown RF1", 28 [1] = "unknown RF1",
29 [UW2451_RF] = "UW2451_RF", 29 [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 a289f95187ec..bd07c9bce8c8 100644
--- 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)
183 const u32 *rv = chan_rv[channel-1]; 183 const u32 *rv = chan_rv[channel-1];
184 struct zd_chip *chip = zd_rf_to_chip(rf); 184 struct zd_chip *chip = zd_rf_to_chip(rf);
185 185
186 struct zd_ioreq16 ioreqs_1[] = { 186 static const struct zd_ioreq16 ioreqs_1[] = {
187 { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 }, 187 { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
188 { CR38, 0x38 }, { CR136, 0xdf }, 188 { CR38, 0x38 }, { CR136, 0xdf },
189 }; 189 };
190 190
191 struct zd_ioreq16 ioreqs_2[] = { 191 static const struct zd_ioreq16 ioreqs_2[] = {
192 /* PLL_ON */ 192 /* PLL_ON */
193 { CR251, 0x3f }, 193 { CR251, 0x3f },
194 { CR203, 0x06 }, { CR240, 0x08 }, 194 { 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 58247271cc24..2d736bdf707c 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -21,7 +21,7 @@
21#include "zd_usb.h" 21#include "zd_usb.h"
22#include "zd_chip.h" 22#include "zd_chip.h"
23 23
24static u32 rf2959_table[][2] = { 24static const u32 rf2959_table[][2] = {
25 RF_CHANNEL( 1) = { 0x181979, 0x1e6666 }, 25 RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
26 RF_CHANNEL( 2) = { 0x181989, 0x1e6666 }, 26 RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
27 RF_CHANNEL( 3) = { 0x181999, 0x1e6666 }, 27 RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
228static int rf2959_set_channel(struct zd_rf *rf, u8 channel) 228static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
229{ 229{
230 int i, r; 230 int i, r;
231 u32 *rv = rf2959_table[channel-1]; 231 const u32 *rv = rf2959_table[channel-1];
232 struct zd_chip *chip = zd_rf_to_chip(rf); 232 struct zd_chip *chip = zd_rf_to_chip(rf);
233 233
234 for (i = 0; i < 2; i++) { 234 for (i = 0; i < 2; i++) {