mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
tipc: Eliminate useless return value when disabling a bearer
Modifies bearer_disable() to return void since it always indicates success anyway. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8d71919d7a
commit
28cc937eac
@ -622,7 +622,7 @@ int tipc_block_bearer(const char *name)
|
||||
* 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 *temp_l_ptr;
|
||||
@ -638,7 +638,6 @@ static int bearer_disable(struct bearer *b_ptr)
|
||||
}
|
||||
spin_unlock_bh(&b_ptr->publ.lock);
|
||||
memset(b_ptr, 0, sizeof(struct bearer));
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tipc_disable_bearer(const char *name)
|
||||
@ -651,8 +650,10 @@ int tipc_disable_bearer(const char *name)
|
||||
if (b_ptr == NULL) {
|
||||
warn("Attempt to disable unknown bearer <%s>\n", name);
|
||||
res = -EINVAL;
|
||||
} else
|
||||
res = bearer_disable(b_ptr);
|
||||
} else {
|
||||
bearer_disable(b_ptr);
|
||||
res = 0;
|
||||
}
|
||||
write_unlock_bh(&tipc_net_lock);
|
||||
return res;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user