From cc13edea0cc71431d087ec9a2430e498e67720ca Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Mon, 1 May 2017 17:21:51 -0700 Subject: [PATCH] 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 --- drivers/android/binder.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 1961f30d14f..9c9a9c74f50 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; } -- 2.20.1