net: bcmdhd: Fix -Waddress warnings

Remove useless address comparison with null to fix -Waddress
warning.

Change-Id: I423d47226e1cbaf321789afff9ec358f96d5c2f2
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c
index a73c28d..3a29905 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_android.c
+++ b/drivers/net/wireless/bcmdhd/wl_android.c
@@ -4905,10 +4905,8 @@ wl_handle_private_cmd(struct net_device *net, char *command, u32 cmd_len)
                        revinfo = 0;
                } else
 #endif /* DHD_BLOB_EXISTENCE_CHECK */
-               if ((rev_info_delim) &&
-                       (strnicmp(rev_info_delim, CMD_COUNTRY_DELIMITER,
-                       strlen(CMD_COUNTRY_DELIMITER)) == 0) &&
-                       (rev_info_delim + 1)) {
+               if ((strnicmp(rev_info_delim, CMD_COUNTRY_DELIMITER,
+                       strlen(CMD_COUNTRY_DELIMITER)) == 0)) {
                        revinfo  = bcm_atoi(rev_info_delim + 1);
                }
                bytes_written = wldev_set_country(net, country_code, true, true, revinfo);

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 7a1e003..0455c5d 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -14546,7 +14546,7 @@ static void wl_scan_timeout(
 
                bi = next_bss(bss_list, bi);
                for_each_bss(bss_list, bi, i) {
-                       if (bi != NULL && &(bi->chanspec) != NULL && (bi->SSID)) {
+                       if (bi != NULL) {
                                channel = wf_chspec_ctlchan(wl_chspec_driver_to_host(bi->chanspec));
                                WL_ERR(("SSID :%s  SSID_LEN :%d  Channel :%d\n", bi->SSID, bi->SSID_len, channel));
                                if (bi->SSID[0] == '\0') {