diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 18:59:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-01 13:57:55 -0800 |
| commit | e83504f72456809cdbdbc91700d3ba6370c9da1c (patch) | |
| tree | 1391c0d5a31ea1f907d82ce43efb9a73423167a9 /net/tipc | |
| parent | 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30 (diff) | |
| download | blackbird-op-linux-e83504f72456809cdbdbc91700d3ba6370c9da1c.tar.gz blackbird-op-linux-e83504f72456809cdbdbc91700d3ba6370c9da1c.zip | |
tipc: remove pointless check for NULL prior to kfree
It is acceptable to call kfree() with NULL, so these checks are not
serving any useful purpose.
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>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/name_distr.c | 4 | ||||
| -rw-r--r-- | net/tipc/port.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 376a30b9fd72..a6c989fd4988 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -240,9 +240,7 @@ static void node_is_down(struct publication *publ) publ->type, publ->lower, publ->node, publ->ref, publ->key); } - if (p) { - kfree(p); - } + kfree(p); } /** diff --git a/net/tipc/port.c b/net/tipc/port.c index 8bacd572a9fb..db14b7e0afdc 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c @@ -269,9 +269,7 @@ int tipc_deleteport(u32 ref) buf = port_build_peer_abort_msg(p_ptr, TIPC_ERR_NO_PORT); tipc_nodesub_unsubscribe(&p_ptr->subscription); } - if (p_ptr->user_port) { - kfree(p_ptr->user_port); - } + kfree(p_ptr->user_port); spin_lock_bh(&tipc_port_list_lock); list_del(&p_ptr->port_list); |
