提交 61db14b2 编写于 作者: P Peter Senna Tschudin 提交者: Greg Kroah-Hartman

staging: wlags49_h2: wl_priv: Remove useless return variables

This patch remove variables that are initialized with a constant,
are never updated, and are only used as parameter of return.
Return the constant instead of using a variable.

Verified by compilation only.

The coccinelle script that find and fixes this issue is:
// <smpl>
@@
type T;
constant C;
identifier ret;
@@
- T ret = C;
... when != ret
- return ret;
+ return C;
// </smpl>
Signed-off-by: NPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 5fd42e29
...@@ -179,8 +179,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp) ...@@ -179,8 +179,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp)
******************************************************************************/ ******************************************************************************/
int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0;
if (!(lp->flags & WVLAN2_UIL_CONNECTED)) { if (!(lp->flags & WVLAN2_UIL_CONNECTED)) {
lp->flags |= WVLAN2_UIL_CONNECTED; lp->flags |= WVLAN2_UIL_CONNECTED;
urq->hcfCtx = &(lp->hcfCtx); urq->hcfCtx = &(lp->hcfCtx);
...@@ -190,7 +188,7 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) ...@@ -190,7 +188,7 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_IN_USE; urq->result = UIL_ERR_IN_USE;
} }
return result; return 0;
} /* wvlan_uil_connect */ } /* wvlan_uil_connect */
/*============================================================================*/ /*============================================================================*/
...@@ -218,8 +216,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) ...@@ -218,8 +216,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
******************************************************************************/ ******************************************************************************/
int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0;
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (lp->flags & WVLAN2_UIL_CONNECTED) { if (lp->flags & WVLAN2_UIL_CONNECTED) {
lp->flags &= ~WVLAN2_UIL_CONNECTED; lp->flags &= ~WVLAN2_UIL_CONNECTED;
...@@ -238,7 +234,7 @@ int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp) ...@@ -238,7 +234,7 @@ int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
return result; return 0;
} /* wvlan_uil_disconnect */ } /* wvlan_uil_disconnect */
/*============================================================================*/ /*============================================================================*/
...@@ -1580,7 +1576,6 @@ int wvlan_set_netname(struct net_device *dev, ...@@ -1580,7 +1576,6 @@ int wvlan_set_netname(struct net_device *dev,
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0;
wl_lock(lp, &flags); wl_lock(lp, &flags);
...@@ -1591,7 +1586,7 @@ int wvlan_set_netname(struct net_device *dev, ...@@ -1591,7 +1586,7 @@ int wvlan_set_netname(struct net_device *dev,
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
return ret; return 0;
} /* wvlan_set_netname */ } /* wvlan_set_netname */
/*============================================================================*/ /*============================================================================*/
...@@ -1683,7 +1678,6 @@ int wvlan_set_station_nickname(struct net_device *dev, ...@@ -1683,7 +1678,6 @@ int wvlan_set_station_nickname(struct net_device *dev,
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
size_t len; size_t len;
int ret = 0;
wl_lock(lp, &flags); wl_lock(lp, &flags);
...@@ -1695,7 +1689,7 @@ int wvlan_set_station_nickname(struct net_device *dev, ...@@ -1695,7 +1689,7 @@ int wvlan_set_station_nickname(struct net_device *dev,
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
return ret; return 0;
} /* wvlan_set_station_nickname */ } /* wvlan_set_station_nickname */
/*============================================================================*/ /*============================================================================*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册