aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/class.c2
-rw-r--r--drivers/base/core.c2
-rw-r--r--include/linux/kobject.h2
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)
262 return 0; 262 return 0;
263} 263}
264 264
265static char *class_hotplug_name(struct kset *kset, struct kobject *kobj) 265static const char *class_hotplug_name(struct kset *kset, struct kobject *kobj)
266{ 266{
267 struct class_device *class_dev = to_class_dev(kobj); 267 struct class_device *class_dev = to_class_dev(kobj);
268 268
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)
102 return 0; 102 return 0;
103} 103}
104 104
105static char *dev_hotplug_name(struct kset *kset, struct kobject *kobj) 105static const char *dev_hotplug_name(struct kset *kset, struct kobject *kobj)
106{ 106{
107 struct device *dev = to_dev(kobj); 107 struct device *dev = to_dev(kobj);
108 108
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 {
94 */ 94 */
95struct kset_hotplug_ops { 95struct 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};