diff options
| author | Isaac Chiou <isaacchiou@google.com> | 2021-08-08 14:24:51 +0800 |
|---|---|---|
| committer | Isaac Chiou <isaacchiou@google.com> | 2021-08-12 08:47:51 +0000 |
| commit | 4505635ae1e5115279428df6572a485712cfb226 (patch) | |
| tree | 5e23657ce7c26890a0add1bc1a614dd0cdb02bd0 /dhd_pcie.c | |
| parent | a4914f30958adb69a6fa631e298d460f9c917f2a (diff) | |
| download | bcm4389-4505635ae1e5115279428df6572a485712cfb226.tar.gz | |
Remove unnecessary if defined identifier when declaring map_path
In current code, map_path is declared when USE_CID_CHECK and SUPPORT_MIXED_MODULES are defined.
map_path needs to be used only when USE_CID_CHECK and SUPPORT_MIXED_MODULES are defined, or it will cause build break if USE_CID_CHECK or SUPPORT_MIXED_MODULES is removed from Kbuild.
To fix it, we remove unnecessary if defined identifier(USE_CID_CHECK and SUPPORT_MIXED_MODULES) when declaring map_path.
Bug: 192631132
Test: Build Pass
Signed-off-by: Isaac Chiou <isaacchiou@google.com>
Change-Id: If2d355553858f6040cce3566984c18c1a4350c30
Diffstat (limited to 'dhd_pcie.c')
| -rw-r--r-- | dhd_pcie.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -3316,10 +3316,9 @@ static int concate_revision_bcm4359(dhd_bus_t *bus, char *fw_path, char *nv_path } #define NVRAM_FEM_MURATA "_murata" -#if defined(SUPPORT_MIXED_MODULES) && defined(USE_CID_CHECK) && defined(DHD_COREDUMP) \ - && defined(SUPPORT_MULTIPLE_REVISION_MAP) +#if defined(DHD_FW_COREDUMP) && defined(DHD_COREDUMP) extern char map_path[PATH_MAX]; -#endif /* SUPPORT_MIXED_MODULES && USE_CID_CHECK && DHD_COREDUMP && SUPPORT_MULTIPLE_REVISION_MAP */ +#endif /* DHD_FW_COREDUMP && DHD_COREDUMP */ static int concate_revision_from_cisinfo(dhd_bus_t *bus, char *fw_path, char *nv_path) @@ -3416,7 +3415,7 @@ vendor_concat_revision(dhd_bus_t *bus, char *fw_path, char *nv_path) if (!bcmstrnstr(map_path, PATH_MAX, tag, strlen(tag))) { strlcat(map_path, tag, PATH_MAX); } -#endif /* DHD_COREDUMP && SUPPORT_MULTIPLE_REVISION_MAP */ +#endif /* DHD_COREDUMP && SUPPORT_MULTIPLE_REVISION_MAP */ return ret; } #endif /* CONCAT_DEF_REV_FOR_NOMATCH_VID */ |