diff options
author | Roland Vossen <rvossen@broadcom.com> | 2011-09-29 18:34:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 19:12:33 -0400 |
commit | c4aa147ac3d0824b37ecdd3d8f7ddba18762c352 (patch) | |
tree | cf125934987ca145b2901b05a6c9bc2b4dbe1beb /drivers/staging/brcm80211/brcmsmac/phy | |
parent | 5c0fd595e2a69d3d1c32251a4cb5e6cfc15387c3 (diff) |
staging: brcm80211: declared global vars in softmac phy as const
Global variables are undesirable unless they are read only.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_n.c | 60 |
3 files changed, 35 insertions, 33 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index f31ebe2ac77..5b814805f45 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | |||
@@ -52,7 +52,7 @@ struct chan_info_basic { | |||
52 | u16 freq; | 52 | u16 freq; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static struct chan_info_basic chan_info_all[] = { | 55 | static const struct chan_info_basic chan_info_all[] = { |
56 | {1, 2412}, | 56 | {1, 2412}, |
57 | {2, 2417}, | 57 | {2, 2417}, |
58 | {3, 2422}, | 58 | {3, 2422}, |
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c index bada9288555..a87e3921b5d 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c | |||
@@ -558,7 +558,7 @@ struct chan_info_2064_lcnphy { | |||
558 | u8 rxrf_rxrf_spare1; | 558 | u8 rxrf_rxrf_spare1; |
559 | }; | 559 | }; |
560 | 560 | ||
561 | static struct chan_info_2064_lcnphy chan_info_2064_lcnphy[] = { | 561 | static const struct chan_info_2064_lcnphy chan_info_2064_lcnphy[] = { |
562 | {1, 2412, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, | 562 | {1, 2412, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, |
563 | {2, 2417, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, | 563 | {2, 2417, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, |
564 | {3, 2422, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, | 564 | {3, 2422, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, |
@@ -575,7 +575,7 @@ static struct chan_info_2064_lcnphy chan_info_2064_lcnphy[] = { | |||
575 | {14, 2484, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, | 575 | {14, 2484, 0x0B, 0x0A, 0x00, 0x07, 0x0A, 0x88, 0x88, 0x80}, |
576 | }; | 576 | }; |
577 | 577 | ||
578 | static struct lcnphy_radio_regs lcnphy_radio_regs_2064[] = { | 578 | static const struct lcnphy_radio_regs lcnphy_radio_regs_2064[] = { |
579 | {0x00, 0, 0, 0, 0}, | 579 | {0x00, 0, 0, 0, 0}, |
580 | {0x01, 0x64, 0x64, 0, 0}, | 580 | {0x01, 0x64, 0x64, 0, 0}, |
581 | {0x02, 0x20, 0x20, 0, 0}, | 581 | {0x02, 0x20, 0x20, 0, 0}, |
@@ -4489,7 +4489,7 @@ static void wlc_lcnphy_rc_cal(struct brcms_phy *pi) | |||
4489 | static void wlc_radio_2064_init(struct brcms_phy *pi) | 4489 | static void wlc_radio_2064_init(struct brcms_phy *pi) |
4490 | { | 4490 | { |
4491 | u32 i; | 4491 | u32 i; |
4492 | struct lcnphy_radio_regs *lcnphyregs = NULL; | 4492 | const struct lcnphy_radio_regs *lcnphyregs = NULL; |
4493 | 4493 | ||
4494 | lcnphyregs = lcnphy_radio_regs_2064; | 4494 | lcnphyregs = lcnphy_radio_regs_2064; |
4495 | 4495 | ||
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c index a34d292bd61..93ac12fc81c 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c | |||
@@ -443,7 +443,7 @@ struct nphy_sfo_cfg { | |||
443 | u16 PHY_BW6; | 443 | u16 PHY_BW6; |
444 | }; | 444 | }; |
445 | 445 | ||
446 | static struct chan_info_nphy_2055 chan_info_nphy_2055[] = { | 446 | static const struct chan_info_nphy_2055 chan_info_nphy_2055[] = { |
447 | { | 447 | { |
448 | 184, 4920, 3280, 0x71, 0x01, 0xEC, 0x0F, 0xFF, 0x01, 0x04, 0x0A, | 448 | 184, 4920, 3280, 0x71, 0x01, 0xEC, 0x0F, 0xFF, 0x01, 0x04, 0x0A, |
449 | 0x00, 0x8F, 0xFF, 0xFF, 0xFF, 0x00, 0x0F, 0x0F, 0x8F, 0xFF, 0x00, 0x0F, | 449 | 0x00, 0x8F, 0xFF, 0xFF, 0xFF, 0x00, 0x0F, 0x0F, 0x8F, 0xFF, 0x00, 0x0F, |
@@ -942,7 +942,7 @@ static struct chan_info_nphy_2055 chan_info_nphy_2055[] = { | |||
942 | 0x01, 0x80, 0x3E6, 0x3E2, 0x3DE, 0x41B, 0x41F, 0x424} | 942 | 0x01, 0x80, 0x3E6, 0x3E2, 0x3DE, 0x41B, 0x41F, 0x424} |
943 | }; | 943 | }; |
944 | 944 | ||
945 | static struct chan_info_nphy_radio205x chan_info_nphyrev3_2056[] = { | 945 | static const struct chan_info_nphy_radio205x chan_info_nphyrev3_2056[] = { |
946 | { | 946 | { |
947 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 947 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
948 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, | 948 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, |
@@ -1565,7 +1565,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev3_2056[] = { | |||
1565 | 0x0f, 0x00, 0x0d, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 1565 | 0x0f, 0x00, 0x0d, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
1566 | }; | 1566 | }; |
1567 | 1567 | ||
1568 | static struct chan_info_nphy_radio205x chan_info_nphyrev4_2056_A1[] = { | 1568 | static const struct chan_info_nphy_radio205x chan_info_nphyrev4_2056_A1[] = { |
1569 | { | 1569 | { |
1570 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 1570 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
1571 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, | 1571 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, |
@@ -2188,7 +2188,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev4_2056_A1[] = { | |||
2188 | 0x0f, 0x00, 0x0e, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 2188 | 0x0f, 0x00, 0x0e, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
2189 | }; | 2189 | }; |
2190 | 2190 | ||
2191 | static struct chan_info_nphy_radio205x chan_info_nphyrev5_2056v5[] = { | 2191 | static const struct chan_info_nphy_radio205x chan_info_nphyrev5_2056v5[] = { |
2192 | { | 2192 | { |
2193 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 2193 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
2194 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, | 2194 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, |
@@ -2811,7 +2811,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev5_2056v5[] = { | |||
2811 | 0x0d, 0x00, 0x08, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 2811 | 0x0d, 0x00, 0x08, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
2812 | }; | 2812 | }; |
2813 | 2813 | ||
2814 | static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v6[] = { | 2814 | static const struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v6[] = { |
2815 | { | 2815 | { |
2816 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 2816 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
2817 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, | 2817 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, |
@@ -3434,7 +3434,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v6[] = { | |||
3434 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 3434 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
3435 | }; | 3435 | }; |
3436 | 3436 | ||
3437 | static struct chan_info_nphy_radio205x chan_info_nphyrev5n6_2056v7[] = { | 3437 | static const struct chan_info_nphy_radio205x chan_info_nphyrev5n6_2056v7[] = { |
3438 | { | 3438 | { |
3439 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 3439 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
3440 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, | 3440 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, |
@@ -4057,7 +4057,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev5n6_2056v7[] = { | |||
4057 | 0x0d, 0x00, 0x08, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 4057 | 0x0d, 0x00, 0x08, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
4058 | }; | 4058 | }; |
4059 | 4059 | ||
4060 | static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v8[] = { | 4060 | static const struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v8[] = { |
4061 | { | 4061 | { |
4062 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, | 4062 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04, 0x0c, 0x01, |
4063 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, | 4063 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, |
@@ -4680,7 +4680,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v8[] = { | |||
4680 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 4680 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
4681 | }; | 4681 | }; |
4682 | 4682 | ||
4683 | static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v11[] = { | 4683 | static const struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v11[] = { |
4684 | { | 4684 | { |
4685 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x02, 0x0c, 0x01, | 4685 | 184, 4920, 0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x02, 0x0c, 0x01, |
4686 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, | 4686 | 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00, 0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, |
@@ -5303,7 +5303,7 @@ static struct chan_info_nphy_radio205x chan_info_nphyrev6_2056v11[] = { | |||
5303 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} | 5303 | 0x09, 0x00, 0x09, 0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424} |
5304 | }; | 5304 | }; |
5305 | 5305 | ||
5306 | static struct chan_info_nphy_radio2057 chan_info_nphyrev7_2057_rev4[] = { | 5306 | static const struct chan_info_nphy_radio2057 chan_info_nphyrev7_2057_rev4[] = { |
5307 | { | 5307 | { |
5308 | 184, 4920, 0x68, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xec, 0x01, 0x0f, | 5308 | 184, 4920, 0x68, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xec, 0x01, 0x0f, |
5309 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0x00, 0x0f, 0x0f, 0xf3, 0x00, 0xef, 0x00, | 5309 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0x00, 0x0f, 0x0f, 0xf3, 0x00, 0xef, 0x00, |
@@ -6166,7 +6166,8 @@ static struct chan_info_nphy_radio2057 chan_info_nphyrev7_2057_rev4[] = { | |||
6166 | 0x0424} | 6166 | 0x0424} |
6167 | }; | 6167 | }; |
6168 | 6168 | ||
6169 | static struct chan_info_nphy_radio2057_rev5 chan_info_nphyrev8_2057_rev5[] = { | 6169 | static const struct chan_info_nphy_radio2057_rev5 |
6170 | chan_info_nphyrev8_2057_rev5[] = { | ||
6170 | { | 6171 | { |
6171 | 1, 2412, 0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c, 0x09, 0x0d, | 6172 | 1, 2412, 0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c, 0x09, 0x0d, |
6172 | 0x08, 0x0e, 0x61, 0x03, 0xff, 0x61, 0x03, 0xff, 0x03c9, 0x03c5, 0x03c1, | 6173 | 0x08, 0x0e, 0x61, 0x03, 0xff, 0x61, 0x03, 0xff, 0x03c9, 0x03c5, 0x03c1, |
@@ -6225,7 +6226,8 @@ static struct chan_info_nphy_radio2057_rev5 chan_info_nphyrev8_2057_rev5[] = { | |||
6225 | 0x041b, 0x041f, 0x0424} | 6226 | 0x041b, 0x041f, 0x0424} |
6226 | }; | 6227 | }; |
6227 | 6228 | ||
6228 | static struct chan_info_nphy_radio2057_rev5 chan_info_nphyrev9_2057_rev5v1[] = { | 6229 | static const struct chan_info_nphy_radio2057_rev5 |
6230 | chan_info_nphyrev9_2057_rev5v1[] = { | ||
6229 | { | 6231 | { |
6230 | 1, 2412, 0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c, 0x09, 0x0d, | 6232 | 1, 2412, 0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c, 0x09, 0x0d, |
6231 | 0x08, 0x0e, 0x61, 0x03, 0xff, 0x61, 0x03, 0xff, 0x03c9, 0x03c5, 0x03c1, | 6233 | 0x08, 0x0e, 0x61, 0x03, 0xff, 0x61, 0x03, 0xff, 0x03c9, 0x03c5, 0x03c1, |
@@ -6284,7 +6286,7 @@ static struct chan_info_nphy_radio2057_rev5 chan_info_nphyrev9_2057_rev5v1[] = { | |||
6284 | 0x041b, 0x041f, 0x0424} | 6286 | 0x041b, 0x041f, 0x0424} |
6285 | }; | 6287 | }; |
6286 | 6288 | ||
6287 | static struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev7[] = { | 6289 | static const struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev7[] = { |
6288 | { | 6290 | { |
6289 | 184, 4920, 0x68, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xec, 0x01, 0x0f, | 6291 | 184, 4920, 0x68, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xec, 0x01, 0x0f, |
6290 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0xd3, 0x0f, 0x0f, 0xd3, 0x00, 0xff, 0x00, | 6292 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0xd3, 0x0f, 0x0f, 0xd3, 0x00, 0xff, 0x00, |
@@ -7025,7 +7027,7 @@ static struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev7[] = { | |||
7025 | 0x0424} | 7027 | 0x0424} |
7026 | }; | 7028 | }; |
7027 | 7029 | ||
7028 | static struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev8[] = { | 7030 | static const struct chan_info_nphy_radio2057 chan_info_nphyrev8_2057_rev8[] = { |
7029 | { | 7031 | { |
7030 | 186, 4930, 0x6b, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xed, 0x01, 0x0f, | 7032 | 186, 4930, 0x6b, 0x16, 0x10, 0x0c, 0x0c, 0x0c, 0x30, 0xed, 0x01, 0x0f, |
7031 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0xd3, 0x0f, 0x0f, 0xd3, 0x00, 0xff, 0x00, | 7033 | 0x00, 0x0f, 0x00, 0xff, 0x00, 0xd3, 0x0f, 0x0f, 0xd3, 0x00, 0xff, 0x00, |
@@ -20387,15 +20389,15 @@ void wlc_phy_switch_radio_nphy(struct brcms_phy *pi, bool on) | |||
20387 | 20389 | ||
20388 | static bool | 20390 | static bool |
20389 | wlc_phy_chan2freq_nphy(struct brcms_phy *pi, uint channel, int *f, | 20391 | wlc_phy_chan2freq_nphy(struct brcms_phy *pi, uint channel, int *f, |
20390 | struct chan_info_nphy_radio2057 **t0, | 20392 | const struct chan_info_nphy_radio2057 **t0, |
20391 | struct chan_info_nphy_radio205x **t1, | 20393 | const struct chan_info_nphy_radio205x **t1, |
20392 | struct chan_info_nphy_radio2057_rev5 **t2, | 20394 | const struct chan_info_nphy_radio2057_rev5 **t2, |
20393 | struct chan_info_nphy_2055 **t3) | 20395 | const struct chan_info_nphy_2055 **t3) |
20394 | { | 20396 | { |
20395 | uint i; | 20397 | uint i; |
20396 | struct chan_info_nphy_radio2057 *chan_info_tbl_p_0 = NULL; | 20398 | const struct chan_info_nphy_radio2057 *chan_info_tbl_p_0 = NULL; |
20397 | struct chan_info_nphy_radio205x *chan_info_tbl_p_1 = NULL; | 20399 | const struct chan_info_nphy_radio205x *chan_info_tbl_p_1 = NULL; |
20398 | struct chan_info_nphy_radio2057_rev5 *chan_info_tbl_p_2 = NULL; | 20400 | const struct chan_info_nphy_radio2057_rev5 *chan_info_tbl_p_2 = NULL; |
20399 | u32 tbl_len = 0; | 20401 | u32 tbl_len = 0; |
20400 | 20402 | ||
20401 | int freq = 0; | 20403 | int freq = 0; |
@@ -20550,10 +20552,10 @@ fail: | |||
20550 | u8 wlc_phy_get_chan_freq_range_nphy(struct brcms_phy *pi, uint channel) | 20552 | u8 wlc_phy_get_chan_freq_range_nphy(struct brcms_phy *pi, uint channel) |
20551 | { | 20553 | { |
20552 | int freq; | 20554 | int freq; |
20553 | struct chan_info_nphy_radio2057 *t0 = NULL; | 20555 | const struct chan_info_nphy_radio2057 *t0 = NULL; |
20554 | struct chan_info_nphy_radio205x *t1 = NULL; | 20556 | const struct chan_info_nphy_radio205x *t1 = NULL; |
20555 | struct chan_info_nphy_radio2057_rev5 *t2 = NULL; | 20557 | const struct chan_info_nphy_radio2057_rev5 *t2 = NULL; |
20556 | struct chan_info_nphy_2055 *t3 = NULL; | 20558 | const struct chan_info_nphy_2055 *t3 = NULL; |
20557 | 20559 | ||
20558 | if (channel == 0) | 20560 | if (channel == 0) |
20559 | channel = CHSPEC_CHANNEL(pi->radio_chanspec); | 20561 | channel = CHSPEC_CHANNEL(pi->radio_chanspec); |
@@ -20573,7 +20575,7 @@ u8 wlc_phy_get_chan_freq_range_nphy(struct brcms_phy *pi, uint channel) | |||
20573 | 20575 | ||
20574 | static void | 20576 | static void |
20575 | wlc_phy_chanspec_radio2055_setup(struct brcms_phy *pi, | 20577 | wlc_phy_chanspec_radio2055_setup(struct brcms_phy *pi, |
20576 | struct chan_info_nphy_2055 *ci) | 20578 | const struct chan_info_nphy_2055 *ci) |
20577 | { | 20579 | { |
20578 | 20580 | ||
20579 | write_radio_reg(pi, RADIO_2055_PLL_REF, ci->RF_pll_ref); | 20581 | write_radio_reg(pi, RADIO_2055_PLL_REF, ci->RF_pll_ref); |
@@ -21294,10 +21296,10 @@ wlc_phy_chanspec_nphy_setup(struct brcms_phy *pi, u16 chanspec, | |||
21294 | void wlc_phy_chanspec_set_nphy(struct brcms_phy *pi, u16 chanspec) | 21296 | void wlc_phy_chanspec_set_nphy(struct brcms_phy *pi, u16 chanspec) |
21295 | { | 21297 | { |
21296 | int freq; | 21298 | int freq; |
21297 | struct chan_info_nphy_radio2057 *t0 = NULL; | 21299 | const struct chan_info_nphy_radio2057 *t0 = NULL; |
21298 | struct chan_info_nphy_radio205x *t1 = NULL; | 21300 | const struct chan_info_nphy_radio205x *t1 = NULL; |
21299 | struct chan_info_nphy_radio2057_rev5 *t2 = NULL; | 21301 | const struct chan_info_nphy_radio2057_rev5 *t2 = NULL; |
21300 | struct chan_info_nphy_2055 *t3 = NULL; | 21302 | const struct chan_info_nphy_2055 *t3 = NULL; |
21301 | 21303 | ||
21302 | if (!wlc_phy_chan2freq_nphy | 21304 | if (!wlc_phy_chan2freq_nphy |
21303 | (pi, CHSPEC_CHANNEL(chanspec), &freq, &t0, &t1, &t2, &t3)) | 21305 | (pi, CHSPEC_CHANNEL(chanspec), &freq, &t0, &t1, &t2, &t3)) |