Evolution-X-Devices/kernel_oneplus_8750-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcom: wlan: qcacld-3.0: Fix regulatory domain country names

Browse Source 
Clang warns:

../qcom/wlan/qcacld-3.0/core/cds/src/cds_regdomain.c:284:43: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation]
        {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
                                                 ^
                                                ,
../qcom/wlan/qcacld-3.0/core/cds/src/cds_regdomain.c:284:38: note: place parentheses around the string literal to silence warning
        {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
                                            ^
../qcom/wlan/qcacld-3.0/core/cds/src/cds_regdomain.c:296:45: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation]
        {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
                                                   ^
                                                  ,
../qcom/wlan/qcacld-3.0/core/cds/src/cds_regdomain.c:296:40: note: place parentheses around the string literal to silence warning
        {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
                                              ^

Change-Id: I35bc21e7946f03fc36fb912f46f742ec23cb8d99
This commit is contained in:
Danny Lin
2020-08-09 22:20:08 -07:00
committed by chandu078
parent d78407bf79
commit 1ed9bda6ae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qcom/opensource/wlan/qcacld-3.0/core/cds/src/cds_regdomain.c
View File

@@ -282,7 +282,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"},
{CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"},
{CTRY_TURKEY, ETSI1_WORLD, "TR", "TURKEY"},
{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", "TURKS AND CAICOS"},
{CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"},
{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"},
{CTRY_UAE, FCC3_WORLD, "AE", "UNITED ARAB EMIRATES"},
@@ -294,7 +294,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
{CTRY_VENEZUELA, FCC2_ETSIC, "VE", "VENEZUELA"},
{CTRY_VIET_NAM, FCC3_WORLD, "VN", "VIETNAM"},
{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", "VIRGIN ISLANDS"},
{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", "WALLIS"},
{CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"},
{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZIMBABWE"},
{CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN"},