diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/connector/cn_queue.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/connector/cn_queue.c')
-rw-r--r-- | drivers/connector/cn_queue.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c index 1f8bf054d11..c42c9d51779 100644 --- a/drivers/connector/cn_queue.c +++ b/drivers/connector/cn_queue.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * cn_queue.c | 2 | * cn_queue.c |
3 | * | 3 | * |
4 | * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> | 4 | * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> |
5 | * All rights reserved. | 5 | * All rights reserved. |
@@ -34,14 +34,13 @@ | |||
34 | static struct cn_callback_entry * | 34 | static struct cn_callback_entry * |
35 | cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name, | 35 | cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name, |
36 | struct cb_id *id, | 36 | struct cb_id *id, |
37 | void (*callback)(struct cn_msg *, | 37 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) |
38 | struct netlink_skb_parms *)) | ||
39 | { | 38 | { |
40 | struct cn_callback_entry *cbq; | 39 | struct cn_callback_entry *cbq; |
41 | 40 | ||
42 | cbq = kzalloc(sizeof(*cbq), GFP_KERNEL); | 41 | cbq = kzalloc(sizeof(*cbq), GFP_KERNEL); |
43 | if (!cbq) { | 42 | if (!cbq) { |
44 | pr_err("Failed to create new callback queue.\n"); | 43 | printk(KERN_ERR "Failed to create new callback queue.\n"); |
45 | return NULL; | 44 | return NULL; |
46 | } | 45 | } |
47 | 46 | ||
@@ -72,8 +71,7 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2) | |||
72 | 71 | ||
73 | int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, | 72 | int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, |
74 | struct cb_id *id, | 73 | struct cb_id *id, |
75 | void (*callback)(struct cn_msg *, | 74 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) |
76 | struct netlink_skb_parms *)) | ||
77 | { | 75 | { |
78 | struct cn_callback_entry *cbq, *__cbq; | 76 | struct cn_callback_entry *cbq, *__cbq; |
79 | int found = 0; | 77 | int found = 0; |
@@ -151,7 +149,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev) | |||
151 | spin_unlock_bh(&dev->queue_lock); | 149 | spin_unlock_bh(&dev->queue_lock); |
152 | 150 | ||
153 | while (atomic_read(&dev->refcnt)) { | 151 | while (atomic_read(&dev->refcnt)) { |
154 | pr_info("Waiting for %s to become free: refcnt=%d.\n", | 152 | printk(KERN_INFO "Waiting for %s to become free: refcnt=%d.\n", |
155 | dev->name, atomic_read(&dev->refcnt)); | 153 | dev->name, atomic_read(&dev->refcnt)); |
156 | msleep(1000); | 154 | msleep(1000); |
157 | } | 155 | } |