Commit 28cc937e authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller

tipc: Eliminate useless return value when disabling a bearer

Modifies bearer_disable() to return void since it always indicates
success anyway.
Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d71919d
...@@ -622,7 +622,7 @@ int tipc_block_bearer(const char *name) ...@@ -622,7 +622,7 @@ int tipc_block_bearer(const char *name)
* Note: This routine assumes caller holds tipc_net_lock. * Note: This routine assumes caller holds tipc_net_lock.
*/ */
static int bearer_disable(struct bearer *b_ptr) static void bearer_disable(struct bearer *b_ptr)
{ {
struct link *l_ptr; struct link *l_ptr;
struct link *temp_l_ptr; struct link *temp_l_ptr;
...@@ -638,7 +638,6 @@ static int bearer_disable(struct bearer *b_ptr) ...@@ -638,7 +638,6 @@ static int bearer_disable(struct bearer *b_ptr)
} }
spin_unlock_bh(&b_ptr->publ.lock); spin_unlock_bh(&b_ptr->publ.lock);
memset(b_ptr, 0, sizeof(struct bearer)); memset(b_ptr, 0, sizeof(struct bearer));
return 0;
} }
int tipc_disable_bearer(const char *name) int tipc_disable_bearer(const char *name)
...@@ -651,8 +650,10 @@ int tipc_disable_bearer(const char *name) ...@@ -651,8 +650,10 @@ int tipc_disable_bearer(const char *name)
if (b_ptr == NULL) { if (b_ptr == NULL) {
warn("Attempt to disable unknown bearer <%s>\n", name); warn("Attempt to disable unknown bearer <%s>\n", name);
res = -EINVAL; res = -EINVAL;
} else } else {
res = bearer_disable(b_ptr); bearer_disable(b_ptr);
res = 0;
}
write_unlock_bh(&tipc_net_lock); write_unlock_bh(&tipc_net_lock);
return res; return res;
} }
......
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