Merge "compiler warning for unused variables"

2 files changed, 2 insertions, 4 deletions

diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp
index 0805128..6f94cc8 100755
--- a/bcmdhd/wifi_hal/nan.cpp
+++ b/bcmdhd/wifi_hal/nan.cpp
@@ -3251,7 +3251,6 @@ class NanMacControl : public WifiCommand
     }
 
     int handleEvent(WifiEvent& event) {
-        u16 inst_id;
         u32 ndp_instance_id = 0;
         int event_id = event.get_vendor_subcmd();
         nlattr *vendor_data = event.get_attribute(NL80211_ATTR_VENDOR_DATA);
@@ -3270,7 +3269,6 @@ class NanMacControl : public WifiCommand
             attr_type = it.get_type();
 
             if (it.get_type() == NAN_ATTRIBUTE_HANDLE) {
-                inst_id = it.get_u8();
             } else if (it.get_type() == NAN_ATTRIBUTE_NDP_ID) {
                 ndp_instance_id = it.get_u32();
                 ALOGI("handleEvent: ndp_instance_id = [%d]\n", ndp_instance_id);
diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp
index 6870ee6..bba7ef3 100755
--- a/bcmdhd/wifi_hal/wifi_logger.cpp
+++ b/bcmdhd/wifi_hal/wifi_logger.cpp
@@ -1931,7 +1931,7 @@ class OtaUpdateCommand : public WifiCommand
 wifi_error read_ota_file(char* file, char** buffer, uint32_t* size)
 {
     FILE* fp = NULL;
-    int file_size, count;
+    int file_size;
     char* buf;
     fp = fopen(file, "r");
 
@@ -1950,7 +1950,7 @@ wifi_error read_ota_file(char* file, char** buffer, uint32_t* size)
     }
     memset(buf, 0, file_size + 1);
     fseek(fp, 0, SEEK_SET);
-    count = fread(buf, file_size, 1, fp);
+    fread(buf, file_size, 1, fp);
 
     *buffer = (char*) buf;
     *size = file_size;