Browse Source

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>
Joe Perches 14 years ago
parent
commit
008536e845
3 changed files with 11 additions and 7 deletions
  1. 4 3
      drivers/connector/cn_queue.c
  2. 1 1
      drivers/connector/connector.c
  3. 6 3
      include/linux/connector.h

+ 4 - 3
drivers/connector/cn_queue.c

@@ -48,7 +48,7 @@ void cn_queue_wrapper(struct work_struct *work)
 }
 }
 
 
 static struct cn_callback_entry *
 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 *))
 			      void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 {
 	struct cn_callback_entry *cbq;
 	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));
 	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 *))
 			  void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 {
 	struct cn_callback_entry *cbq, *__cbq;
 	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;
 	struct cn_queue_dev *dev;
 
 

+ 1 - 1
drivers/connector/connector.c

@@ -205,7 +205,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
  *
  *
  * May sleep.
  * May sleep.
  */
  */
-int cn_add_callback(struct cb_id *id, char *name,
+int cn_add_callback(struct cb_id *id, const char *name,
 		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *))
 {
 {
 	int err;
 	int err;

+ 6 - 3
include/linux/connector.h

@@ -129,14 +129,17 @@ struct cn_dev {
 	struct cn_queue_dev *cbdev;
 	struct cn_queue_dev *cbdev;
 };
 };
 
 
-int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));
+int cn_add_callback(struct cb_id *id, const char *name,
+		    void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
 void cn_del_callback(struct cb_id *);
 void cn_del_callback(struct cb_id *);
 int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 
 
-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 *));
+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 cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
 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 *);
+struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *);
 void cn_queue_free_dev(struct cn_queue_dev *dev);
 void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
 int cn_cb_equal(struct cb_id *, struct cb_id *);