Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/net/wireless/zd1211rw/zd_rf.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/net/wireless/zd1211rw/zd_rf_al7230b.c

+2 −2
Original line number Diff line number Diff line
@@ -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 },

drivers/net/wireless/zd1211rw/zd_rf_rf2959.c

+2 −2
Original line number Diff line number Diff line
@@ -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++) {