diff options
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 765d660d3bea..3b22304f12fd 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 *); |
| @@ -94,7 +94,7 @@ struct kobj_type { | |||
| 94 | */ | 94 | */ |
| 95 | struct kset_hotplug_ops { | 95 | struct kset_hotplug_ops { |
| 96 | int (*filter)(struct kset *kset, struct kobject *kobj); | 96 | int (*filter)(struct kset *kset, struct kobject *kobj); |
| 97 | char *(*name)(struct kset *kset, struct kobject *kobj); | 97 | const char *(*name)(struct kset *kset, struct kobject *kobj); |
| 98 | int (*hotplug)(struct kset *kset, struct kobject *kobj, char **envp, | 98 | int (*hotplug)(struct kset *kset, struct kobject *kobj, char **envp, |
| 99 | int num_envp, char *buffer, int buffer_size); | 99 | int num_envp, char *buffer, int buffer_size); |
| 100 | }; | 100 | }; |
