mwifiex: remove unnecessary variable initialization

Skip initialization of local variables with some default values
if the values are not going to be used further down the code path.

Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 31a529578805..4968974f3427 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -117,8 +117,8 @@ mwifiex_search_oui_in_ie(struct ie_body *iebody, u8 *oui)
 static u8
 mwifiex_is_rsn_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
 {
-        u8 *oui = NULL;
-        struct ie_body *iebody = NULL;
+        u8 *oui;
+        struct ie_body *iebody;
         u8 ret = MWIFIEX_OUI_NOT_PRESENT;
 
         if (((bss_desc->bcn_rsn_ie) && ((*(bss_desc->bcn_rsn_ie)).
@@ -144,8 +144,8 @@ mwifiex_is_rsn_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
 static u8
 mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
 {
-        u8 *oui = NULL;
-        struct ie_body *iebody = NULL;
+        u8 *oui;
+        struct ie_body *iebody;
         u8 ret = MWIFIEX_OUI_NOT_PRESENT;
 
         if (((bss_desc->bcn_wpa_ie) && ((*(bss_desc->bcn_wpa_ie)).
@@ -181,7 +181,7 @@ int mwifiex_find_best_bss(struct mwifiex_private *priv,
                           struct mwifiex_ssid_bssid *ssid_bssid)
 {
         struct mwifiex_ssid_bssid tmp_ssid_bssid;
-        u8 *mac = NULL;
+        u8 *mac;
 
         if (!ssid_bssid)
                 return -1;
@@ -213,7 +213,7 @@ int mwifiex_find_best_bss(struct mwifiex_private *priv,
 int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
                                 struct mwifiex_user_scan_cfg *scan_req)
 {
-        int status = 0;
+        int status;
 
         priv->adapter->cmd_wait_q.condition = false;
 
@@ -2253,8 +2253,8 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
 {
         int ret = 0;
         struct mwifiex_adapter *adapter = priv->adapter;
-        struct cmd_ctrl_node *cmd_node = NULL;
-        union mwifiex_scan_cmd_config_tlv *scan_cfg_out = NULL;
+        struct cmd_ctrl_node *cmd_node;
+        union mwifiex_scan_cmd_config_tlv *scan_cfg_out;
         struct mwifiex_ie_types_chan_list_param_set *chan_list_out;
         u32 buf_size;
         struct mwifiex_chan_scan_param_set *scan_chan_list;
@@ -2404,8 +2404,8 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
 {
         int ret = 0;
         struct mwifiex_adapter *adapter = priv->adapter;
-        struct cmd_ctrl_node *cmd_node = NULL;
-        struct host_cmd_ds_802_11_scan_rsp *scan_rsp = NULL;
+        struct cmd_ctrl_node *cmd_node;
+        struct host_cmd_ds_802_11_scan_rsp *scan_rsp;
         struct mwifiex_bssdescriptor *bss_new_entry = NULL;
         struct mwifiex_ie_types_data *tlv_data;
         struct mwifiex_ie_types_tsf_timestamp *tsf_tlv;
@@ -2906,7 +2906,7 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
 int mwifiex_request_scan(struct mwifiex_private *priv,
                          struct mwifiex_802_11_ssid *req_ssid)
 {
-        int ret = 0;
+        int ret;
 
         if (down_interruptible(&priv->async_sem)) {
                 dev_err(priv->adapter->dev, "%s: acquire semaphore\n",