net: bcmdhd: remove gcc 7 build warnings
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 6 Sep 2018 02:00:16 +0000 (11:00 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 27 Feb 2019 02:13:12 +0000 (11:13 +0900)
Remove following gcc 7 build warnings:
   drivers/net/wireless/bcmdhd/dhd_common.c: In function ‘dhd_pktfilter_offload_set’:
   drivers/net/wireless/bcmdhd/dhd_common.c:3015:16: error: comparison between pointer and zero character constant [-Werror=pointer-compare]
       if (argv[i] == '\0') {
                   ^~
   drivers/net/wireless/bcmdhd/dhd_common.c:3015:8: note: did you mean to dereference the pointer?
       if (argv[i] == '\0') {
           ^
   drivers/net/wireless/bcmdhd/dhd_rtt.c: In function ‘dhd_rtt_init’:
   drivers/net/wireless/bcmdhd/dhd_rtt.c:983:56: error: ‘subcmd_info.version’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
     *out_version = (ret == BCME_OK) ? subcmd_info.version : 0;
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
   drivers/net/wireless/bcmdhd/dhd_rtt.c:977:20: note: ‘subcmd_info.version’ was declared here
     ftm_subcmd_info_t subcmd_info;
                       ^~~~~~~~~~~

Change-Id: I5990eaba2272ecb9633bb0058668eb426fc99d2e
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
drivers/net/wireless/bcmdhd/dhd_common.c
drivers/net/wireless/bcmdhd/dhd_rtt.c

index 6e8e86a..e9083e9 100644 (file)
@@ -3012,7 +3012,7 @@ dhd_pktfilter_offload_set(dhd_pub_t * dhd, char *arg)
                                        htod16(WL_PKT_FILTER_MFLAG_NEG);
                                (argv[i])++;
                        }
-                       if (argv[i] == '\0') {
+                       if (*argv[i] == '\0') {
                                printf("Pattern not provided\n");
                                goto fail;
                        }
index 02d4c16..4bd779a 100644 (file)
@@ -978,6 +978,7 @@ dhd_rtt_get_version(dhd_pub_t *dhd, int *out_version)
        subcmd_info.name = "ver";
        subcmd_info.cmdid = WL_PROXD_CMD_GET_VERSION;
        subcmd_info.handler = NULL;
+       subcmd_info.version = 0;
        ret = dhd_rtt_common_get_handler(dhd, &subcmd_info,
                        WL_PROXD_METHOD_FTM, WL_PROXD_SESSION_ID_GLOBAL);
        *out_version = (ret == BCME_OK) ? subcmd_info.version : 0;