[PATCH RESEND] qtnfmac: remove meaningless labels

[samirweng1979]

From: wengjianfeng <wengjianf...@yulong.com>

some function's label meaningless, the return statement follows
the goto statement, so just remove it.

Signed-off-by: wengjianfeng <wengjianf...@yulong.com>
---
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 27 +++++------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c 
b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 504b4d0..84b15a6 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -680,13 +680,10 @@ static int qtnf_set_default_key(struct wiphy *wiphy, 
struct net_device *dev,
                eth_zero_addr(vif->bssid);
 
        ret = qtnf_cmd_send_connect(vif, sme);
-       if (ret) {
+       if (ret)
                pr_err("VIF%u.%u: failed to connect\n",
                       vif->mac->macid, vif->vifid);
-               goto out;
-       }
 
-out:
        return ret;
 }
 
@@ -702,13 +699,10 @@ static int qtnf_set_default_key(struct wiphy *wiphy, 
struct net_device *dev,
                pr_warn("unexpected bssid: %pM", auth->bssid);
 
        ret = qtnf_cmd_send_external_auth(vif, auth);
-       if (ret) {
+       if (ret)
                pr_err("VIF%u.%u: failed to report external auth\n",
                       vif->mac->macid, vif->vifid);
-               goto out;
-       }
 
-out:
        return ret;
 }
 
@@ -727,8 +721,7 @@ static int qtnf_set_default_key(struct wiphy *wiphy, struct 
net_device *dev,
        }
 
        if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
-               ret = -EOPNOTSUPP;
-               goto out;
+               return -EOPNOTSUPP;
        }
 
        ret = qtnf_cmd_send_disconnect(vif, reason_code);
@@ -742,7 +735,6 @@ static int qtnf_set_default_key(struct wiphy *wiphy, struct 
net_device *dev,
                                      NULL, 0, true, GFP_KERNEL);
        }
 
-out:
        return ret;
 }
 
@@ -935,13 +927,10 @@ static int qtnf_update_owe_info(struct wiphy *wiphy, 
struct net_device *dev,
                return -EOPNOTSUPP;
 
        ret = qtnf_cmd_send_update_owe(vif, owe_info);
-       if (ret) {
+       if (ret)
                pr_err("VIF%u.%u: failed to update owe info\n",
                       vif->mac->macid, vif->vifid);
-               goto out;
-       }
 
-out:
        return ret;
 }
 
@@ -987,18 +976,14 @@ static int qtnf_resume(struct wiphy *wiphy)
        vif = qtnf_mac_get_base_vif(mac);
        if (!vif) {
                pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
-               ret = -EFAULT;
-               goto exit;
+               return -EFAULT;
        }
 
        ret = qtnf_cmd_send_wowlan_set(vif, NULL);
-       if (ret) {
+       if (ret)
                pr_err("MAC%u: failed to reset WoWLAN triggers\n",
                       mac->macid);
-               goto exit;
-       }
 
-exit:
        return ret;
 }
 
-- 
1.9.1