diff options
author | Joe Perches <joe@perches.com> | 2011-02-19 18:45:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-23 16:22:26 -0500 |
commit | 008536e8458613ce569595e43b0e71afa8b48ae8 (patch) | |
tree | 9e3243f20245f51baaae1bba7e7a28aff45a54dc | |
parent | 31acaa50c6c61bfb486dacaa2ec62950a42de233 (diff) |
connector: Convert char *name to const char *name
Allow more const declarations.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/connector/cn_queue.c | 7 | ||||
-rw-r--r-- | drivers/connector/connector.c | 2 | ||||
-rw-r--r-- | include/linux/connector.h | 9 |
3 files changed, 11 insertions, 7 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) | |||
48 | } | 48 | } |
49 | 49 | ||
50 | static struct cn_callback_entry * | 50 | static struct cn_callback_entry * |
51 | cn_queue_alloc_callback_entry(char *name, struct cb_id *id, | 51 | cn_queue_alloc_callback_entry(const char *name, struct cb_id *id, |
52 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) | 52 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) |
53 | { | 53 | { |
54 | struct cn_callback_entry *cbq; | 54 | struct cn_callback_entry *cbq; |
@@ -78,7 +78,8 @@ int cn_cb_equal(struct cb_id *i1, struct cb_id *i2) | |||
78 | return ((i1->idx == i2->idx) && (i1->val == i2->val)); | 78 | return ((i1->idx == i2->idx) && (i1->val == i2->val)); |
79 | } | 79 | } |
80 | 80 | ||
81 | int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, | 81 | int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, |
82 | struct cb_id *id, | ||
82 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) | 83 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) |
83 | { | 84 | { |
84 | struct cn_callback_entry *cbq, *__cbq; | 85 | struct cn_callback_entry *cbq, *__cbq; |
@@ -135,7 +136,7 @@ void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id) | |||
135 | } | 136 | } |
136 | } | 137 | } |
137 | 138 | ||
138 | struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls) | 139 | struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *nls) |
139 | { | 140 | { |
140 | struct cn_queue_dev *dev; | 141 | struct cn_queue_dev *dev; |
141 | 142 | ||
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 05117f1ad867..f7554de3be5e 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
@@ -205,7 +205,7 @@ static void cn_rx_skb(struct sk_buff *__skb) | |||
205 | * | 205 | * |
206 | * May sleep. | 206 | * May sleep. |
207 | */ | 207 | */ |
208 | int cn_add_callback(struct cb_id *id, char *name, | 208 | int cn_add_callback(struct cb_id *id, const char *name, |
209 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) | 209 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)) |
210 | { | 210 | { |
211 | int err; | 211 | int err; |
diff --git a/include/linux/connector.h b/include/linux/connector.h index 2e9759cdd275..bcafc942e5e4 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
@@ -129,14 +129,17 @@ struct cn_dev { | |||
129 | struct cn_queue_dev *cbdev; | 129 | struct cn_queue_dev *cbdev; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *, struct netlink_skb_parms *)); | 132 | int cn_add_callback(struct cb_id *id, const char *name, |
133 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)); | ||
133 | void cn_del_callback(struct cb_id *); | 134 | void cn_del_callback(struct cb_id *); |
134 | int cn_netlink_send(struct cn_msg *, u32, gfp_t); | 135 | int cn_netlink_send(struct cn_msg *, u32, gfp_t); |
135 | 136 | ||
136 | int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(struct cn_msg *, struct netlink_skb_parms *)); | 137 | int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, |
138 | struct cb_id *id, | ||
139 | void (*callback)(struct cn_msg *, struct netlink_skb_parms *)); | ||
137 | void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id); | 140 | void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id); |
138 | 141 | ||
139 | struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *); | 142 | struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *); |
140 | void cn_queue_free_dev(struct cn_queue_dev *dev); | 143 | void cn_queue_free_dev(struct cn_queue_dev *dev); |
141 | 144 | ||
142 | int cn_cb_equal(struct cb_id *, struct cb_id *); | 145 | int cn_cb_equal(struct cb_id *, struct cb_id *); |