summaryrefslogtreecommitdiff
path: root/drivers/android/binder.c
diff options
context:
space:
mode:
authorTodd Kjos <tkjos@google.com>2017-05-01 17:21:51 -0700
committerTodd Kjos <tkjos@google.com>2017-07-13 15:12:54 +0000
commitce9b7747d6a1cb1b4b772b4e2c524ba1a56b551b (patch)
treea1007b967a1b255f94384d781cf3d0ea0cadf3f2 /drivers/android/binder.c
parentafda44d0aa52f4427a6867fe784997f307b7fe31 (diff)
FROMLIST: binder: remove dead code in binder_get_ref_for_node
(from https://patchwork.kernel.org/patch/9817819/) node is always non-NULL in binder_get_ref_for_node so the conditional and else clause are not needed Change-Id: I23f011ba59e1869d9577e6bf28e1f1dd38f45713 Signed-off-by: Todd Kjos <tkjos@google.com>
Diffstat (limited to 'drivers/android/binder.c')
-rw-r--r--drivers/android/binder.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 6eb9fc064846..812c86bae4db 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -671,18 +671,12 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,
}
rb_link_node(&new_ref->rb_node_desc, parent, p);
rb_insert_color(&new_ref->rb_node_desc, &proc->refs_by_desc);
- if (node) {
- hlist_add_head(&new_ref->node_entry, &node->refs);
+ hlist_add_head(&new_ref->node_entry, &node->refs);
- binder_debug(BINDER_DEBUG_INTERNAL_REFS,
- "%d new ref %d desc %d for node %d\n",
- proc->pid, new_ref->debug_id, new_ref->desc,
- node->debug_id);
- } else {
- binder_debug(BINDER_DEBUG_INTERNAL_REFS,
- "%d new ref %d desc %d for dead node\n",
- proc->pid, new_ref->debug_id, new_ref->desc);
- }
+ binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+ "%d new ref %d desc %d for node %d\n",
+ proc->pid, new_ref->debug_id, new_ref->desc,
+ node->debug_id);
return new_ref;
}