[common] binder: fix conflict (4.14.47 -> 4.14.62)

Change-Id: I34e66f7917db6d6f27e28b12b205953889ecc64f
Signed-off-by: Yunji Kim <yunji.kim@samsung.com>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 98228a123758ff257d49de8e78cd23e1dc595fbf..dddd93a40107137725116e150d71385b1b5661e1 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -5047,8 +5047,8 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
        return 0;
 
 err_bad_arg:
-       pr_err("binder_mmap: %d(%s) %lx-%lx %s failed %d\n",
-              proc->pid, proc->tsk->comm, vma->vm_start, vma->vm_end, failure_string, ret);
+       pr_err("%s: %d(%s) %lx-%lx %s failed %d\n", __func__,
+               proc->pid, proc->tsk->comm, vma->vm_start, vma->vm_end, failure_string, ret);
        return ret;
 }
 
@@ -5057,7 +5057,7 @@ static int binder_open(struct inode *nodp, struct file *filp)
        struct binder_proc *proc;
        struct binder_device *binder_dev;
 
-       binder_debug(BINDER_DEBUG_OPEN_CLOSE, "binder_open: %d:%d (%s:%s)\n",
+       binder_debug(BINDER_DEBUG_OPEN_CLOSE, "%s: %d:%d (%s:%s)\n", __func__,
                     current->group_leader->pid, current->pid,
                     current->group_leader->comm, current->comm);