Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 419cab3f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[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: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f3b4f3c6

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/kobject.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

};