Commit d2d7c052 authored by Daniel Drake's avatar Daniel Drake Committed by Jeff Garzik

[PATCH] zd1211rw: Mark some data const

This is a backport of Helge Deller's recent patch for wireless-dev.git
Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 85d32e7b
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "zd_ieee80211.h" #include "zd_ieee80211.h"
#include "zd_chip.h" #include "zd_chip.h"
static const char *rfs[] = { static const char * const rfs[] = {
[0] = "unknown RF0", [0] = "unknown RF0",
[1] = "unknown RF1", [1] = "unknown RF1",
[UW2451_RF] = "UW2451_RF", [UW2451_RF] = "UW2451_RF",
......
...@@ -183,12 +183,12 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel) ...@@ -183,12 +183,12 @@ static int al7230b_set_channel(struct zd_rf *rf, u8 channel)
const u32 *rv = chan_rv[channel-1]; const u32 *rv = chan_rv[channel-1];
struct zd_chip *chip = zd_rf_to_chip(rf); 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 }, { CR128, 0x14 }, { CR129, 0x12 }, { CR130, 0x10 },
{ CR38, 0x38 }, { CR136, 0xdf }, { CR38, 0x38 }, { CR136, 0xdf },
}; };
struct zd_ioreq16 ioreqs_2[] = { static const struct zd_ioreq16 ioreqs_2[] = {
/* PLL_ON */ /* PLL_ON */
{ CR251, 0x3f }, { CR251, 0x3f },
{ CR203, 0x06 }, { CR240, 0x08 }, { CR203, 0x06 }, { CR240, 0x08 },
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "zd_usb.h" #include "zd_usb.h"
#include "zd_chip.h" #include "zd_chip.h"
static u32 rf2959_table[][2] = { static const u32 rf2959_table[][2] = {
RF_CHANNEL( 1) = { 0x181979, 0x1e6666 }, RF_CHANNEL( 1) = { 0x181979, 0x1e6666 },
RF_CHANNEL( 2) = { 0x181989, 0x1e6666 }, RF_CHANNEL( 2) = { 0x181989, 0x1e6666 },
RF_CHANNEL( 3) = { 0x181999, 0x1e6666 }, RF_CHANNEL( 3) = { 0x181999, 0x1e6666 },
...@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf) ...@@ -228,7 +228,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
static int rf2959_set_channel(struct zd_rf *rf, u8 channel) static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
{ {
int i, r; 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); struct zd_chip *chip = zd_rf_to_chip(rf);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
......
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