diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-04-26 02:32:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 15:15:01 -0700 |
| commit | 419cab3fc69588ebe35b845cc3a584ae172463de (patch) | |
| tree | 7886076bcc4970005cbd39c886eb414bb61242a4 | |
| parent | f3b4f3c6dec04c6c8261fe22645f07b39976595a (diff) | |
| download | blackbird-op-linux-419cab3fc69588ebe35b845cc3a584ae172463de.tar.gz blackbird-op-linux-419cab3fc69588ebe35b845cc3a584ae172463de.zip | |
[PATCH] kset_hotplug_ops->name shoudl return const char *
kobject: change name() method in kset_hotplug_ops return const char *
since users shoudl not try to modify returned data.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/class.c | 2 | ||||
| -rw-r--r-- | drivers/base/core.c | 2 | ||||
| -rw-r--r-- | include/linux/kobject.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index d2a2f8f2b4ed..ff33ebbf1dc7 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -262,7 +262,7 @@ static int class_hotplug_filter(struct kset *kset, struct kobject *kobj) return 0; } -static char *class_hotplug_name(struct kset *kset, struct kobject *kobj) +static const char *class_hotplug_name(struct kset *kset, struct kobject *kobj) { struct class_device *class_dev = to_class_dev(kobj); diff --git a/drivers/base/core.c b/drivers/base/core.c index fbc223486f81..32f3f09a42e0 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -102,7 +102,7 @@ static int dev_hotplug_filter(struct kset *kset, struct kobject *kobj) return 0; } -static char *dev_hotplug_name(struct kset *kset, struct kobject *kobj) +static const char *dev_hotplug_name(struct kset *kset, struct kobject *kobj) { struct device *dev = to_dev(kobj); diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 76dc67245c0c..3b22304f12fd 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -94,7 +94,7 @@ struct kobj_type { */ struct kset_hotplug_ops { int (*filter)(struct kset *kset, struct kobject *kobj); - char *(*name)(struct kset *kset, struct kobject *kobj); + const char *(*name)(struct kset *kset, struct kobject *kobj); int (*hotplug)(struct kset *kset, struct kobject *kobj, char **envp, int num_envp, char *buffer, int buffer_size); }; |
