Skip to content

L
linux
Commit 258767fe authored by Sherwin Soltani's avatar Sherwin Soltani Committed by Greg Kroah-Hartman
Browse files
Options

drivers: staging: android: binder.c: fix printk macros 

Change printk() messages to pr_* macros.
Signed-off-by: default avatarSherwin Soltani <sherwin@wybc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 779c0c46
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
drivers/staging/android/binder.c
View file @ 258767fe
...@@ -124,13 +124,13 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error, ...@@ -124,13 +124,13 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error,
#define binder_debug(mask, x...) \ #define binder_debug(mask, x...) \
do { \ do { \
if (binder_debug_mask & mask) \ if (binder_debug_mask & mask) \
printk(KERN_INFO x); \ pr_info(x); \
} while (0) } while (0)
#define binder_user_error(x...) \ #define binder_user_error(x...) \
do { \ do { \
if (binder_debug_mask & BINDER_DEBUG_USER_ERROR) \ if (binder_debug_mask & BINDER_DEBUG_USER_ERROR) \
printk(KERN_INFO x); \ pr_info(x); \
if (binder_stop_on_user_error) \ if (binder_stop_on_user_error) \
binder_stop_on_user_error = 2; \ binder_stop_on_user_error = 2; \
} while (0) } while (0)
...@@ -418,7 +418,7 @@ int task_get_unused_fd_flags(struct binder_proc *proc, int flags) ...@@ -418,7 +418,7 @@ int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
#if 1 #if 1
/* Sanity check */ /* Sanity check */
if (fdt->fd[fd] != NULL) { if (fdt->fd[fd] != NULL) {
printk(KERN_WARNING "get_unused_fd: slot %d not NULL!\n", fd); pr_warn("get_unused_fd: slot %d not NULL!\n", fd);
fdt->fd[fd] = NULL; fdt->fd[fd] = NULL;
} }
#endif #endif
...@@ -644,7 +644,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, ...@@ -644,7 +644,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
goto free_range; goto free_range;
if (vma == NULL) { if (vma == NULL) {
printk(KERN_ERR "binder: %d: binder_alloc_buf failed to " pr_err("binder: %d: binder_alloc_buf failed to "
"map pages in userspace, no vma\n", proc->pid); "map pages in userspace, no vma\n", proc->pid);
goto err_no_vma; goto err_no_vma;
} }
...@@ -657,7 +657,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, ...@@ -657,7 +657,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
BUG_ON(*page); BUG_ON(*page);
*page = alloc_page(GFP_KERNEL | __GFP_ZERO); *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
if (*page == NULL) { if (*page == NULL) {
printk(KERN_ERR "binder: %d: binder_alloc_buf failed " pr_err("binder: %d: binder_alloc_buf failed "
"for page at %p\n", proc->pid, page_addr); "for page at %p\n", proc->pid, page_addr);
goto err_alloc_page_failed; goto err_alloc_page_failed;
} }
...@@ -666,7 +666,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, ...@@ -666,7 +666,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
page_array_ptr = page; page_array_ptr = page;
ret = map_vm_area(&tmp_area, PAGE_KERNEL, &page_array_ptr); ret = map_vm_area(&tmp_area, PAGE_KERNEL, &page_array_ptr);
if (ret) { if (ret) {
printk(KERN_ERR "binder: %d: binder_alloc_buf failed " pr_err("binder: %d: binder_alloc_buf failed "
"to map page at %p in kernel\n", "to map page at %p in kernel\n",
proc->pid, page_addr); proc->pid, page_addr);
goto err_map_kernel_failed; goto err_map_kernel_failed;
...@@ -675,7 +675,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, ...@@ -675,7 +675,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
(uintptr_t)page_addr + proc->user_buffer_offset; (uintptr_t)page_addr + proc->user_buffer_offset;
ret = vm_insert_page(vma, user_page_addr, page[0]); ret = vm_insert_page(vma, user_page_addr, page[0]);
if (ret) { if (ret) {
printk(KERN_ERR "binder: %d: binder_alloc_buf failed " pr_err("binder: %d: binder_alloc_buf failed "
"to map page at %lx in userspace\n", "to map page at %lx in userspace\n",
proc->pid, user_page_addr); proc->pid, user_page_addr);
goto err_vm_insert_page_failed; goto err_vm_insert_page_failed;
...@@ -724,7 +724,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc, ...@@ -724,7 +724,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
size_t size; size_t size;
if (proc->vma == NULL) { if (proc->vma == NULL) {
printk(KERN_ERR "binder: %d: binder_alloc_buf, no vma\n", pr_err("binder: %d: binder_alloc_buf, no vma\n",
proc->pid); proc->pid);
return NULL; return NULL;
} }
...@@ -762,7 +762,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc, ...@@ -762,7 +762,7 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
} }
} }
if (best_fit == NULL) { if (best_fit == NULL) {
printk(KERN_ERR "binder: %d: binder_alloc_buf size %zd failed, " pr_err("binder: %d: binder_alloc_buf size %zd failed, "
"no address space\n", proc->pid, size); "no address space\n", proc->pid, size);
return NULL; return NULL;
} }
...@@ -997,7 +997,7 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal, ...@@ -997,7 +997,7 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal,
node->internal_strong_refs == 0 && node->internal_strong_refs == 0 &&
!(node == binder_context_mgr_node && !(node == binder_context_mgr_node &&
node->has_strong_ref)) { node->has_strong_ref)) {
printk(KERN_ERR "binder: invalid inc strong " pr_err("binder: invalid inc strong "
"node for %d\n", node->debug_id); "node for %d\n", node->debug_id);
return -EINVAL; return -EINVAL;
} }
...@@ -1013,7 +1013,7 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal, ...@@ -1013,7 +1013,7 @@ static int binder_inc_node(struct binder_node *node, int strong, int internal,
node->local_weak_refs++; node->local_weak_refs++;
if (!node->has_weak_ref && list_empty(&node->work.entry)) { if (!node->has_weak_ref && list_empty(&node->work.entry)) {
if (target_list == NULL) { if (target_list == NULL) {
printk(KERN_ERR "binder: invalid inc weak node " pr_err("binder: invalid inc weak node "
"for %d\n", node->debug_id); "for %d\n", node->debug_id);
return -EINVAL; return -EINVAL;
} }
...@@ -1276,7 +1276,7 @@ static void binder_send_failed_reply(struct binder_transaction *t, ...@@ -1276,7 +1276,7 @@ static void binder_send_failed_reply(struct binder_transaction *t,
target_thread->return_error = error_code; target_thread->return_error = error_code;
wake_up_interruptible(&target_thread->wait); wake_up_interruptible(&target_thread->wait);
} else { } else {
printk(KERN_ERR "binder: reply failed, target " pr_err("binder: reply failed, target "
"thread, %d:%d, has error code %d " "thread, %d:%d, has error code %d "
"already\n", target_thread->proc->pid, "already\n", target_thread->proc->pid,
target_thread->pid, target_thread->pid,
...@@ -1331,7 +1331,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, ...@@ -1331,7 +1331,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
if (*offp > buffer->data_size - sizeof(*fp) || if (*offp > buffer->data_size - sizeof(*fp) ||
buffer->data_size < sizeof(*fp) || buffer->data_size < sizeof(*fp) ||
!IS_ALIGNED(*offp, sizeof(void *))) { !IS_ALIGNED(*offp, sizeof(void *))) {
printk(KERN_ERR "binder: transaction release %d bad" pr_err("binder: transaction release %d bad"
"offset %zd, size %zd\n", debug_id, "offset %zd, size %zd\n", debug_id,
*offp, buffer->data_size); *offp, buffer->data_size);
continue; continue;
...@@ -1342,7 +1342,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, ...@@ -1342,7 +1342,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
case BINDER_TYPE_WEAK_BINDER: { case BINDER_TYPE_WEAK_BINDER: {
struct binder_node *node = binder_get_node(proc, fp->binder); struct binder_node *node = binder_get_node(proc, fp->binder);
if (node == NULL) { if (node == NULL) {
printk(KERN_ERR "binder: transaction release %d" pr_err("binder: transaction release %d"
" bad node %p\n", debug_id, fp->binder); " bad node %p\n", debug_id, fp->binder);
break; break;
} }
...@@ -1355,7 +1355,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, ...@@ -1355,7 +1355,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
case BINDER_TYPE_WEAK_HANDLE: { case BINDER_TYPE_WEAK_HANDLE: {
struct binder_ref *ref = binder_get_ref(proc, fp->handle); struct binder_ref *ref = binder_get_ref(proc, fp->handle);
if (ref == NULL) { if (ref == NULL) {
printk(KERN_ERR "binder: transaction release %d" pr_err("binder: transaction release %d"
" bad handle %ld\n", debug_id, " bad handle %ld\n", debug_id,
fp->handle); fp->handle);
break; break;
...@@ -1374,7 +1374,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, ...@@ -1374,7 +1374,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
break; break;
default: default:
printk(KERN_ERR "binder: transaction release %d bad " pr_err("binder: transaction release %d bad "
"object type %lx\n", debug_id, fp->type); "object type %lx\n", debug_id, fp->type);
break; break;
} }
...@@ -1925,10 +1925,10 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread, ...@@ -1925,10 +1925,10 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
break; break;
} }
case BC_ATTEMPT_ACQUIRE: case BC_ATTEMPT_ACQUIRE:
printk(KERN_ERR "binder: BC_ATTEMPT_ACQUIRE not supported\n"); pr_err("binder: BC_ATTEMPT_ACQUIRE not supported\n");
return -EINVAL; return -EINVAL;
case BC_ACQUIRE_RESULT: case BC_ACQUIRE_RESULT:
printk(KERN_ERR "binder: BC_ACQUIRE_RESULT not supported\n"); pr_err("binder: BC_ACQUIRE_RESULT not supported\n");
return -EINVAL; return -EINVAL;
case BC_FREE_BUFFER: { case BC_FREE_BUFFER: {
...@@ -2165,7 +2165,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread, ...@@ -2165,7 +2165,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
} break; } break;
default: default:
printk(KERN_ERR "binder: %d:%d unknown command %d\n", pr_err("binder: %d:%d unknown command %d\n",
proc->pid, thread->pid, cmd); proc->pid, thread->pid, cmd);
return -EINVAL; return -EINVAL;
} }
...@@ -2635,7 +2635,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -2635,7 +2635,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int size = _IOC_SIZE(cmd); unsigned int size = _IOC_SIZE(cmd);
void __user *ubuf = (void __user *)arg; void __user *ubuf = (void __user *)arg;
/*printk(KERN_INFO "binder_ioctl: %d:%d %x %lx\n", proc->pid, current->pid, cmd, arg);*/ /*pr_info("binder_ioctl: %d:%d %x %lx\n", proc->pid, current->pid, cmd, arg);*/
ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2); ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
if (ret) if (ret)
...@@ -2701,13 +2701,13 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -2701,13 +2701,13 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
break; break;
case BINDER_SET_CONTEXT_MGR: case BINDER_SET_CONTEXT_MGR:
if (binder_context_mgr_node != NULL) { if (binder_context_mgr_node != NULL) {
printk(KERN_ERR "binder: BINDER_SET_CONTEXT_MGR already set\n"); pr_err("binder: BINDER_SET_CONTEXT_MGR already set\n");
ret = -EBUSY; ret = -EBUSY;
goto err; goto err;
} }
if (binder_context_mgr_uid != -1) { if (binder_context_mgr_uid != -1) {
if (binder_context_mgr_uid != current->cred->euid) { if (binder_context_mgr_uid != current->cred->euid) {
printk(KERN_ERR "binder: BINDER_SET_" pr_err("binder: BINDER_SET_"
"CONTEXT_MGR bad uid %d != %d\n", "CONTEXT_MGR bad uid %d != %d\n",
current->cred->euid, current->cred->euid,
binder_context_mgr_uid); binder_context_mgr_uid);
...@@ -2753,7 +2753,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -2753,7 +2753,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
mutex_unlock(&binder_lock); mutex_unlock(&binder_lock);
wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2); wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
if (ret && ret != -ERESTARTSYS) if (ret && ret != -ERESTARTSYS)
printk(KERN_INFO "binder: %d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret); pr_info("binder: %d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);
return ret; return ret;
} }
...@@ -2829,7 +2829,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -2829,7 +2829,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
#ifdef CONFIG_CPU_CACHE_VIPT #ifdef CONFIG_CPU_CACHE_VIPT
if (cache_is_vipt_aliasing()) { if (cache_is_vipt_aliasing()) {
while (CACHE_COLOUR((vma->vm_start ^ (uint32_t)proc->buffer))) { while (CACHE_COLOUR((vma->vm_start ^ (uint32_t)proc->buffer))) {
printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p bad alignment\n", proc->pid, vma->vm_start, vma->vm_end, proc->buffer); pr_info("binder_mmap: %d %lx-%lx maps %p bad alignment\n", proc->pid, vma->vm_start, vma->vm_end, proc->buffer);
vma->vm_start += PAGE_SIZE; vma->vm_start += PAGE_SIZE;
} }
} }
...@@ -2861,7 +2861,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -2861,7 +2861,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
proc->vma = vma; proc->vma = vma;
proc->vma_vm_mm = vma->vm_mm; proc->vma_vm_mm = vma->vm_mm;
/*printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p\n", /*pr_info("binder_mmap: %d %lx-%lx maps %p\n",
proc->pid, vma->vm_start, vma->vm_end, proc->buffer);*/ proc->pid, vma->vm_start, vma->vm_end, proc->buffer);*/
return 0; return 0;
...@@ -2876,7 +2876,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -2876,7 +2876,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
err_already_mapped: err_already_mapped:
mutex_unlock(&binder_mmap_lock); mutex_unlock(&binder_mmap_lock);
err_bad_arg: err_bad_arg:
printk(KERN_ERR "binder_mmap: %d %lx-%lx %s failed %d\n", pr_err("binder_mmap: %d %lx-%lx %s failed %d\n",
proc->pid, vma->vm_start, vma->vm_end, failure_string, ret); proc->pid, vma->vm_start, vma->vm_end, failure_string, ret);
return ret; return ret;
} }
...@@ -3031,7 +3031,7 @@ static void binder_deferred_release(struct binder_proc *proc) ...@@ -3031,7 +3031,7 @@ static void binder_deferred_release(struct binder_proc *proc)
if (t) { if (t) {
t->buffer = NULL; t->buffer = NULL;
buffer->transaction = NULL; buffer->transaction = NULL;
printk(KERN_ERR "binder: release proc %d, " pr_err("binder: release proc %d, "
"transaction %d, not freed\n", "transaction %d, not freed\n",
proc->pid, t->debug_id); proc->pid, t->debug_id);
/*BUG();*/ /*BUG();*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7