diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-04-26 03:32:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 18:15:00 -0400 |
| commit | f3b4f3c6dec04c6c8261fe22645f07b39976595a (patch) | |
| tree | 9c4ad15f5d5fc7d3a8006396b185bb615386a61c /include/linux/kobject.h | |
| parent | e3a15db2415579d5136b9ba9b52fe27c66da8780 (diff) | |
[PATCH] Make kobject's name be const char *
kobject: make kobject's name const char * since users should not
attempt to change it (except by calling kobject_rename).
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 765d660d3be..76dc67245c0 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | extern u64 hotplug_seqnum; | 33 | extern u64 hotplug_seqnum; |
| 34 | 34 | ||
| 35 | struct kobject { | 35 | struct kobject { |
| 36 | char * k_name; | 36 | const char * k_name; |
| 37 | char name[KOBJ_NAME_LEN]; | 37 | char name[KOBJ_NAME_LEN]; |
| 38 | struct kref kref; | 38 | struct kref kref; |
| 39 | struct list_head entry; | 39 | struct list_head entry; |
| @@ -46,7 +46,7 @@ struct kobject { | |||
| 46 | extern int kobject_set_name(struct kobject *, const char *, ...) | 46 | extern int kobject_set_name(struct kobject *, const char *, ...) |
| 47 | __attribute__((format(printf,2,3))); | 47 | __attribute__((format(printf,2,3))); |
| 48 | 48 | ||
| 49 | static inline char * kobject_name(struct kobject * kobj) | 49 | static inline const char * kobject_name(const struct kobject * kobj) |
| 50 | { | 50 | { |
| 51 | return kobj->k_name; | 51 | return kobj->k_name; |
| 52 | } | 52 | } |
| @@ -57,7 +57,7 @@ extern void kobject_cleanup(struct kobject *); | |||
| 57 | extern int kobject_add(struct kobject *); | 57 | extern int kobject_add(struct kobject *); |
| 58 | extern void kobject_del(struct kobject *); | 58 | extern void kobject_del(struct kobject *); |
| 59 | 59 | ||
| 60 | extern int kobject_rename(struct kobject *, char *new_name); | 60 | extern int kobject_rename(struct kobject *, const char *new_name); |
| 61 | 61 | ||
| 62 | extern int kobject_register(struct kobject *); | 62 | extern int kobject_register(struct kobject *); |
| 63 | extern void kobject_unregister(struct kobject *); | 63 | extern void kobject_unregister(struct kobject *); |
