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, 9 insertions, 14 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 77a80296b6c..0c0116374d7 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -77,18 +77,15 @@ mwifiex_channels_to_cfg80211_channel_type(int channel_type)
 static int
 mwifiex_is_alg_wep(u32 cipher)
 {
-        int alg = 0;
-
         switch (cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
-                alg = 1;
-                break;
+                return 1;
         default:
-                alg = 0;
                 break;
         }
-        return alg;
+
+        return 0;
 }
 
 /*
@@ -408,7 +405,7 @@ mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
 static int
 mwifiex_set_frag(struct mwifiex_private *priv, u32 frag_thr)
 {
-        int ret = 0;
+        int ret;
 
         if (frag_thr < MWIFIEX_FRAG_MIN_VALUE
             || frag_thr > MWIFIEX_FRAG_MAX_VALUE)
@@ -449,7 +446,6 @@ static int
 mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
         struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
-
         int ret = 0;
 
         if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
@@ -473,7 +469,7 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,
                                      enum nl80211_iftype type, u32 *flags,
                                      struct vif_params *params)
 {
-        int ret = 0;
+        int ret;
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
 
         if (priv->bss_mode == type) {
@@ -717,7 +713,7 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)
 {
         struct ieee80211_channel *chan;
         struct mwifiex_bss_info bss_info;
-        int ie_len = 0;
+        int ie_len;
         u8 ie_buf[IEEE80211_MAX_SSID_LEN + sizeof(struct ieee_types_header)];
 
         if (mwifiex_get_bss_info(priv, &bss_info))
@@ -903,8 +899,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
 {
         struct mwifiex_802_11_ssid req_ssid;
         struct mwifiex_ssid_bssid ssid_bssid;
-        int ret = 0;
-        int auth_type = 0;
+        int ret, auth_type = 0;
 
         memset(&req_ssid, 0, sizeof(struct mwifiex_802_11_ssid));
         memset(&ssid_bssid, 0, sizeof(struct mwifiex_ssid_bssid));
@@ -1247,8 +1242,8 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
 int mwifiex_register_cfg80211(struct net_device *dev, u8 *mac,
                               struct mwifiex_private *priv)
 {
-        int ret = 0;
-        void *wdev_priv = NULL;
+        int ret;
+        void *wdev_priv;
         struct wireless_dev *wdev;
 
         wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);