Commit a221d0af authored by wengjianfeng's avatar wengjianfeng Committed by Kalle Valo

qtnfmac: remove meaningless labels

some function's label meaningless, the return statement follows
the goto statement, so just remove it.
Signed-off-by: default avatarwengjianfeng <wengjianfeng@yulong.com>
Reviewed-by: default avatarSergey Matyukevich <geomatsi@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210223065754.34392-1-samirweng1979@163.com
parent 18fb0bed
...@@ -680,13 +680,10 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -680,13 +680,10 @@ qtnf_connect(struct wiphy *wiphy, struct net_device *dev,
eth_zero_addr(vif->bssid); eth_zero_addr(vif->bssid);
ret = qtnf_cmd_send_connect(vif, sme); ret = qtnf_cmd_send_connect(vif, sme);
if (ret) { if (ret)
pr_err("VIF%u.%u: failed to connect\n", pr_err("VIF%u.%u: failed to connect\n",
vif->mac->macid, vif->vifid); vif->mac->macid, vif->vifid);
goto out;
}
out:
return ret; return ret;
} }
...@@ -702,13 +699,10 @@ qtnf_external_auth(struct wiphy *wiphy, struct net_device *dev, ...@@ -702,13 +699,10 @@ qtnf_external_auth(struct wiphy *wiphy, struct net_device *dev,
pr_warn("unexpected bssid: %pM", auth->bssid); pr_warn("unexpected bssid: %pM", auth->bssid);
ret = qtnf_cmd_send_external_auth(vif, auth); ret = qtnf_cmd_send_external_auth(vif, auth);
if (ret) { if (ret)
pr_err("VIF%u.%u: failed to report external auth\n", pr_err("VIF%u.%u: failed to report external auth\n",
vif->mac->macid, vif->vifid); vif->mac->macid, vif->vifid);
goto out;
}
out:
return ret; return ret;
} }
...@@ -727,8 +721,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -727,8 +721,7 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
} }
if (vif->wdev.iftype != NL80211_IFTYPE_STATION) { if (vif->wdev.iftype != NL80211_IFTYPE_STATION) {
ret = -EOPNOTSUPP; return -EOPNOTSUPP;
goto out;
} }
ret = qtnf_cmd_send_disconnect(vif, reason_code); ret = qtnf_cmd_send_disconnect(vif, reason_code);
...@@ -742,7 +735,6 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -742,7 +735,6 @@ qtnf_disconnect(struct wiphy *wiphy, struct net_device *dev,
NULL, 0, true, GFP_KERNEL); NULL, 0, true, GFP_KERNEL);
} }
out:
return ret; return ret;
} }
...@@ -935,13 +927,10 @@ static int qtnf_update_owe_info(struct wiphy *wiphy, struct net_device *dev, ...@@ -935,13 +927,10 @@ static int qtnf_update_owe_info(struct wiphy *wiphy, struct net_device *dev,
return -EOPNOTSUPP; return -EOPNOTSUPP;
ret = qtnf_cmd_send_update_owe(vif, owe_info); ret = qtnf_cmd_send_update_owe(vif, owe_info);
if (ret) { if (ret)
pr_err("VIF%u.%u: failed to update owe info\n", pr_err("VIF%u.%u: failed to update owe info\n",
vif->mac->macid, vif->vifid); vif->mac->macid, vif->vifid);
goto out;
}
out:
return ret; return ret;
} }
...@@ -987,18 +976,14 @@ static int qtnf_resume(struct wiphy *wiphy) ...@@ -987,18 +976,14 @@ static int qtnf_resume(struct wiphy *wiphy)
vif = qtnf_mac_get_base_vif(mac); vif = qtnf_mac_get_base_vif(mac);
if (!vif) { if (!vif) {
pr_err("MAC%u: primary VIF is not configured\n", mac->macid); pr_err("MAC%u: primary VIF is not configured\n", mac->macid);
ret = -EFAULT; return -EFAULT;
goto exit;
} }
ret = qtnf_cmd_send_wowlan_set(vif, NULL); ret = qtnf_cmd_send_wowlan_set(vif, NULL);
if (ret) { if (ret)
pr_err("MAC%u: failed to reset WoWLAN triggers\n", pr_err("MAC%u: failed to reset WoWLAN triggers\n",
mac->macid); mac->macid);
goto exit;
}
exit:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment