diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 08:44:08 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 08:44:08 +0100 |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /drivers/connector/cn_queue.c | |
| parent | sh: update sh7757lcr_defconfig (diff) | |
| parent | Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz linux-1d2a1959fe534279cf37aba20b08c24c20840e52.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/connector/cn_queue.c')
| -rw-r--r-- | drivers/connector/cn_queue.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c index 81270d221e5a..55653aba6735 100644 --- a/drivers/connector/cn_queue.c +++ b/drivers/connector/cn_queue.c @@ -48,7 +48,7 @@ void cn_queue_wrapper(struct work_struct *work) } static struct cn_callback_entry * -cn_queue_alloc_callback_entry(char *name, struct cb_id *id, +cn_queue_alloc_callback_entry(const char *name, struct cb_id *id, void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) { struct cn_callback_entry *cbq; @@ -78,7 +78,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2) return ((i1->idx == i2->idx) && (i1->val == i2->val)); } -int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, +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 *)) { struct cn_callback_entry *cbq, *__cbq; @@ -135,7 +136,7 @@ void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id) } } -struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls) +struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *nls) { struct cn_queue_dev *dev; |