Commit 79cac25e authored by Bitterblue Smith's avatar Bitterblue Smith Committed by Kalle Valo
Browse files

wifi: rtl8xxxu: Make some arrays const 



All the initialisation tables, plus rtl8xxxu_rfregs.

Most of them were already static.

Signed-off-by: default avatarBitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/9407f219-a7ba-676e-3d99-154d67b312d2@gmail.com
parent 47813205

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+4 −4
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ struct rtl8xxxu_fileops { 
	u16 trxff_boundary;

	u8 pbp_rx;

	u8 pbp_tx;

	struct rtl8xxxu_reg8val *mactable;

	const struct rtl8xxxu_reg8val *mactable;

	u8 total_page_num;

	u8 page_num_hi;

	u8 page_num_lo;
@@ -1509,7 +1509,7 @@ struct rtl8xxxu_fileops { 


extern int rtl8xxxu_debug;



extern struct rtl8xxxu_reg8val rtl8xxxu_gen1_mac_init_table[];

extern const struct rtl8xxxu_reg8val rtl8xxxu_gen1_mac_init_table[];

extern const u32 rtl8xxxu_iqk_phy_iq_bb_reg[];

u8 rtl8xxxu_read8(struct rtl8xxxu_priv *priv, u16 addr);

u16 rtl8xxxu_read16(struct rtl8xxxu_priv *priv, u16 addr);
@@ -1538,10 +1538,10 @@ void rtl8xxxu_fill_iqk_matrix_a(struct rtl8xxxu_priv *priv, bool iqk_ok, 
void rtl8xxxu_fill_iqk_matrix_b(struct rtl8xxxu_priv *priv, bool iqk_ok,

				int result[][8], int candidate, bool tx_only);

int rtl8xxxu_init_phy_rf(struct rtl8xxxu_priv *priv,

			 struct rtl8xxxu_rfregval *table,

			 const struct rtl8xxxu_rfregval *table,

			 enum rtl8xxxu_rfpath path);

int rtl8xxxu_init_phy_regs(struct rtl8xxxu_priv *priv,

			   struct rtl8xxxu_reg32val *array);

			   const struct rtl8xxxu_reg32val *array);

int rtl8xxxu_load_firmware(struct rtl8xxxu_priv *priv, char *fw_name);

void rtl8xxxu_firmware_self_reset(struct rtl8xxxu_priv *priv);

void rtl8xxxu_power_off(struct rtl8xxxu_priv *priv);

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "rtl8xxxu.h"

#include "rtl8xxxu_regs.h"



static struct rtl8xxxu_reg8val rtl8188f_mac_init_table[] = {

static const struct rtl8xxxu_reg8val rtl8188f_mac_init_table[] = {

	{0x024, 0xDF}, {0x025, 0x07}, {0x02B, 0x1C}, {0x283, 0x20},

	{0x421, 0x0F}, {0x428, 0x0A}, {0x429, 0x10}, {0x430, 0x00},

	{0x431, 0x00}, {0x432, 0x00}, {0x433, 0x01}, {0x434, 0x04},
@@ -60,7 +60,7 @@ static struct rtl8xxxu_reg8val rtl8188f_mac_init_table[] = { 
	{0xffff, 0xff},

};



static struct rtl8xxxu_reg32val rtl8188fu_phy_init_table[] = {

static const struct rtl8xxxu_reg32val rtl8188fu_phy_init_table[] = {

	{0x800, 0x80045700}, {0x804, 0x00000001},

	{0x808, 0x0000FC00}, {0x80C, 0x0000000A},

	{0x810, 0x10001331}, {0x814, 0x020C3D10},
@@ -168,7 +168,7 @@ static struct rtl8xxxu_reg32val rtl8188fu_phy_init_table[] = { 
	{0xffff, 0xffffffff},

};



static struct rtl8xxxu_reg32val rtl8188f_agc_table[] = {

static const struct rtl8xxxu_reg32val rtl8188f_agc_table[] = {

	{0xC78, 0xFC000001}, {0xC78, 0xFB010001},

	{0xC78, 0xFA020001}, {0xC78, 0xF9030001},

	{0xC78, 0xF8040001}, {0xC78, 0xF7050001},
@@ -205,7 +205,7 @@ static struct rtl8xxxu_reg32val rtl8188f_agc_table[] = { 
	{0xffff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8188fu_radioa_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8188fu_radioa_init_table[] = {

	{0x00, 0x00030000}, {0x08, 0x00008400},

	{0x18, 0x00000407}, {0x19, 0x00000012},

	{0x1B, 0x00001C6C},
@@ -263,7 +263,7 @@ static struct rtl8xxxu_rfregval rtl8188fu_radioa_init_table[] = { 
	{0xff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8188fu_cut_b_radioa_init_table[] = {

	{0x00, 0x00030000}, {0x08, 0x00008400},

	{0x18, 0x00000407}, {0x19, 0x00000012},

	{0x1B, 0x00001C6C},

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct rtl8xxxu_power_base rtl8188r_power_base = { 
	.reg_0868 = 0x00020204,

};



static struct rtl8xxxu_rfregval rtl8192cu_radioa_2t_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8192cu_radioa_2t_init_table[] = {

	{0x00, 0x00030159}, {0x01, 0x00031284},

	{0x02, 0x00098000}, {0x03, 0x00018c63},

	{0x04, 0x000210e7}, {0x09, 0x0002044f},
@@ -152,7 +152,7 @@ static struct rtl8xxxu_rfregval rtl8192cu_radioa_2t_init_table[] = { 
	{0xff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8192cu_radiob_2t_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8192cu_radiob_2t_init_table[] = {

	{0x00, 0x00030159}, {0x01, 0x00031284},

	{0x02, 0x00098000}, {0x03, 0x00018c63},

	{0x04, 0x000210e7}, {0x09, 0x0002044f},
@@ -176,7 +176,7 @@ static struct rtl8xxxu_rfregval rtl8192cu_radiob_2t_init_table[] = { 
	{0xff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8192cu_radioa_1t_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8192cu_radioa_1t_init_table[] = {

	{0x00, 0x00030159}, {0x01, 0x00031284},

	{0x02, 0x00098000}, {0x03, 0x00018c63},

	{0x04, 0x000210e7}, {0x09, 0x0002044f},
@@ -251,7 +251,7 @@ static struct rtl8xxxu_rfregval rtl8192cu_radioa_1t_init_table[] = { 
	{0xff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = {

static const struct rtl8xxxu_rfregval rtl8188ru_radioa_1t_highpa_table[] = {

	{0x00, 0x00030159}, {0x01, 0x00031284},

	{0x02, 0x00098000}, {0x03, 0x00018c63},

	{0x04, 0x000210e7}, {0x09, 0x0002044f},
@@ -413,7 +413,7 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv) 


static int rtl8192cu_init_phy_rf(struct rtl8xxxu_priv *priv)

{

	struct rtl8xxxu_rfregval *rftable;

	const struct rtl8xxxu_rfregval *rftable;

	int ret;



	if (priv->rtl_chip == RTL8188R) {

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "rtl8xxxu.h"

#include "rtl8xxxu_regs.h"



static struct rtl8xxxu_reg8val rtl8192e_mac_init_table[] = {

static const struct rtl8xxxu_reg8val rtl8192e_mac_init_table[] = {

	{0x011, 0xeb}, {0x012, 0x07}, {0x014, 0x75}, {0x303, 0xa7},

	{0x428, 0x0a}, {0x429, 0x10}, {0x430, 0x00}, {0x431, 0x00},

	{0x432, 0x00}, {0x433, 0x01}, {0x434, 0x04}, {0x435, 0x05},
@@ -62,7 +62,7 @@ static struct rtl8xxxu_reg8val rtl8192e_mac_init_table[] = { 
	{0xffff, 0xff},

};



static struct rtl8xxxu_reg32val rtl8192eu_phy_init_table[] = {

static const struct rtl8xxxu_reg32val rtl8192eu_phy_init_table[] = {

	{0x800, 0x80040000}, {0x804, 0x00000003},

	{0x808, 0x0000fc00}, {0x80c, 0x0000000a},

	{0x810, 0x10001331}, {0x814, 0x020c3d10},
@@ -194,7 +194,7 @@ static struct rtl8xxxu_reg32val rtl8192eu_phy_init_table[] = { 
	{0xffff, 0xffffffff},

};



static struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_std_table[] = {

static const struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_std_table[] = {

	{0xc78, 0xfb000001}, {0xc78, 0xfb010001},

	{0xc78, 0xfb020001}, {0xc78, 0xfb030001},

	{0xc78, 0xfb040001}, {0xc78, 0xfb050001},
@@ -263,7 +263,7 @@ static struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_std_table[] = { 
	{0xffff, 0xffffffff}

};



static struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_highpa_table[] = {

static const struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_highpa_table[] = {

	{0xc78, 0xfa000001}, {0xc78, 0xf9010001},

	{0xc78, 0xf8020001}, {0xc78, 0xf7030001},

	{0xc78, 0xf6040001}, {0xc78, 0xf5050001},
@@ -332,7 +332,7 @@ static struct rtl8xxxu_reg32val rtl8xxx_agc_8192eu_highpa_table[] = { 
	{0xffff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8192eu_radioa_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8192eu_radioa_init_table[] = {

	{0x7f, 0x00000082}, {0x81, 0x0003fc00},

	{0x00, 0x00030000}, {0x08, 0x00008400},

	{0x18, 0x00000407}, {0x19, 0x00000012},
@@ -412,7 +412,7 @@ static struct rtl8xxxu_rfregval rtl8192eu_radioa_init_table[] = { 
	{0xff, 0xffffffff}

};



static struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8192eu_radiob_init_table[] = {

	{0x7f, 0x00000082}, {0x81, 0x0003fc00},

	{0x00, 0x00030000}, {0x08, 0x00008400},

	{0x18, 0x00000407}, {0x19, 0x00000012},

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct rtl8xxxu_power_base rtl8723a_power_base = { 
	.reg_0868 = 0x02040608,

};



static struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = {

static const struct rtl8xxxu_rfregval rtl8723au_radioa_1t_init_table[] = {

	{0x00, 0x00030159}, {0x01, 0x00031284},

	{0x02, 0x00098000}, {0x03, 0x00039c63},

	{0x04, 0x000210e7}, {0x09, 0x0002044f},