Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[deliverable/linux.git] / drivers / infiniband / core / ucma.c

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 8b5a934e1133d80b42e12d1790b3672d73e4a779..dd3bcceadfdef2d277109e0ecfeb334052c1efa4 100644 (file)
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -314,7 +314,7 @@ static void ucma_removal_event_handler(struct rdma_cm_id *cm_id)
                }
        }
        if (!event_found)
-               printk(KERN_ERR "ucma_removal_event_handler: warning: connect request event wasn't found\n");
+               pr_err("ucma_removal_event_handler: warning: connect request event wasn't found\n");
 }
 
 static int ucma_event_handler(struct rdma_cm_id *cm_id,
@@ -1716,13 +1716,13 @@ static int __init ucma_init(void)
 
        ret = device_create_file(ucma_misc.this_device, &dev_attr_abi_version);
        if (ret) {
-               printk(KERN_ERR "rdma_ucm: couldn't create abi_version attr\n");
+               pr_err("rdma_ucm: couldn't create abi_version attr\n");
                goto err1;
        }
 
        ucma_ctl_table_hdr = register_net_sysctl(&init_net, "net/rdma_ucm", ucma_ctl_table);
        if (!ucma_ctl_table_hdr) {
-               printk(KERN_ERR "rdma_ucm: couldn't register sysctl paths\n");
+               pr_err("rdma_ucm: couldn't register sysctl paths\n");
                ret = -ENOMEM;
                goto err2;
        }