Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

[firefly-linux-kernel-4.4.55.git] / drivers / connector / cn_queue.c

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index c42c9d517790b35d8570197a2038a0cda66f4a42..1f8bf054d11c16a51ecdbc168d83736818aed1b2 100644 (file)
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -1,5 +1,5 @@
 /*
- *     cn_queue.c
+ *     cn_queue.c
  *
  * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
  * All rights reserved.
@@ -34,13 +34,14 @@
 static struct cn_callback_entry *
 cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name,
                              struct cb_id *id,
-                             void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
+                             void (*callback)(struct cn_msg *,
+                                              struct netlink_skb_parms *))
 {
        struct cn_callback_entry *cbq;
 
        cbq = kzalloc(sizeof(*cbq), GFP_KERNEL);
        if (!cbq) {
-               printk(KERN_ERR "Failed to create new callback queue.\n");
+               pr_err("Failed to create new callback queue.\n");
                return NULL;
        }
 
@@ -71,7 +72,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)
 
 int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,
                          struct cb_id *id,
-                         void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
+                         void (*callback)(struct cn_msg *,
+                                          struct netlink_skb_parms *))
 {
        struct cn_callback_entry *cbq, *__cbq;
        int found = 0;
@@ -149,7 +151,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev)
        spin_unlock_bh(&dev->queue_lock);
 
        while (atomic_read(&dev->refcnt)) {
-               printk(KERN_INFO "Waiting for %s to become free: refcnt=%d.\n",
+               pr_info("Waiting for %s to become free: refcnt=%d.\n",
                       dev->name, atomic_read(&dev->refcnt));
                msleep(1000);
        }