FROMLIST: binder: remove dead code in binder_get_ref_for_node
authorTodd Kjos <tkjos@google.com>
Tue, 2 May 2017 00:21:51 +0000 (17:21 -0700)
committerTodd Kjos <tkjos@google.com>
Thu, 13 Jul 2017 15:34:20 +0000 (08:34 -0700)
(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: I89ca8c3c0a1a263624a0bd5ddb14e9093ae12009
Signed-off-by: Todd Kjos <tkjos@google.com>
drivers/android/binder.c

index ad17599..e872bf7 100644 (file)
@@ -670,18 +670,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;
 }