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

Commit 5c5daf65 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

Driver core: exclude kobject_uevent.c for !CONFIG_HOTPLUG 



Move uevent specific logic from the core into kobject_uevent.c, which
does no longer require to link the unused string array if hotplug
is not compiled in.

Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 07c015e7

drivers/base/core.c

+4 −14
Original line number Diff line number Diff line
@@ -234,13 +234,11 @@ static ssize_t show_uevent(struct device *dev, struct device_attribute *attr, 


	/* search the kset, the device belongs to */

	top_kobj = &dev->kobj;

	if (!top_kobj->kset && top_kobj->parent) {

		do {

	while (!top_kobj->kset && top_kobj->parent)

		top_kobj = top_kobj->parent;

		} while (!top_kobj->kset && top_kobj->parent);

	}

	if (!top_kobj->kset)

		goto out;



	kset = top_kobj->kset;

	if (!kset->uevent_ops || !kset->uevent_ops->uevent)

		goto out;
@@ -270,17 +268,9 @@ out: 
static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,

			    const char *buf, size_t count)

{

	size_t len = count;

	enum kobject_action action;



	if (len && buf[len-1] == '\n')

		len--;



	for (action = 0; action < KOBJ_MAX; action++) {

		if (strncmp(kobject_actions[action], buf, len) != 0)

			continue;

		if (kobject_actions[action][len] != '\0')

			continue;

	if (kobject_action_type(buf, count, &action) == 0) {

		kobject_uevent(&dev->kobj, action);

		goto out;

	}

include/linux/kobject.h

+7 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ enum kobject_action { 
	KOBJ_MAX

};



/* The list of strings defining the valid kobject actions as specified above */

extern const char *kobject_actions[];



struct kobject {

	const char		* k_name;

	struct kref		kref;
@@ -241,6 +238,9 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, 


int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)

	__attribute__((format (printf, 2, 3)));



int kobject_action_type(const char *buf, size_t count,

			enum kobject_action *type);

#else

static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action)

{ return 0; }
@@ -251,6 +251,10 @@ static inline int kobject_uevent_env(struct kobject *kobj, 


static inline int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...)

{ return 0; }



static inline int kobject_action_type(const char *buf, size_t count,

			enum kobject_action *type)

{ return -EINVAL; }

#endif



#endif /* __KERNEL__ */

lib/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ 
lib-$(CONFIG_MMU) += ioremap.o

lib-$(CONFIG_SMP) += cpumask.o



lib-y	+= kobject.o kref.o kobject_uevent.o klist.o

lib-y	+= kobject.o kref.o klist.o



obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \

	 bust_spinlocks.o hexdump.o kasprintf.o
@@ -20,6 +20,7 @@ CFLAGS_kobject.o += -DDEBUG 
CFLAGS_kobject_uevent.o += -DDEBUG

endif



lib-$(CONFIG_HOTPLUG) += kobject_uevent.o

obj-$(CONFIG_GENERIC_IOMAP) += iomap.o

obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o

obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o

lib/kobject_uevent.c

+44 −13
Original line number Diff line number Diff line
@@ -23,17 +23,6 @@ 
#include <net/sock.h>





/* the strings here must match the enum in include/linux/kobject.h */

const char *kobject_actions[] = {

	"add",

	"remove",

	"change",

	"move",

	"online",

	"offline",

};



#if defined(CONFIG_HOTPLUG)

u64 uevent_seqnum;

char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;

static DEFINE_SPINLOCK(sequence_lock);
@@ -41,6 +30,50 @@ static DEFINE_SPINLOCK(sequence_lock); 
static struct sock *uevent_sock;

#endif



/* the strings here must match the enum in include/linux/kobject.h */

static const char *kobject_actions[] = {

	[KOBJ_ADD] =		"add",

	[KOBJ_REMOVE] =		"remove",

	[KOBJ_CHANGE] =		"change",

	[KOBJ_MOVE] =		"move",

	[KOBJ_ONLINE] =		"online",

	[KOBJ_OFFLINE] =	"offline",

};



/**

 * kobject_action_type - translate action string to numeric type

 *

 * @buf: buffer containing the action string, newline is ignored

 * @len: length of buffer

 * @type: pointer to the location to store the action type

 *

 * Returns 0 if the action string was recognized.

 */

int kobject_action_type(const char *buf, size_t count,

			enum kobject_action *type)

{

	enum kobject_action action;

	int ret = -EINVAL;



	if (count && buf[count-1] == '\n')

		count--;



	if (!count)

		goto out;



	for (action = 0; action < ARRAY_SIZE(kobject_actions); action++) {

		if (strncmp(kobject_actions[action], buf, count) != 0)

			continue;

		if (kobject_actions[action][count] != '\0')

			continue;

		*type = action;

		ret = 0;

		break;

	}

out:

	return ret;

}



/**

 * kobject_uevent_env - send an uevent with environmental data

 *
@@ -270,5 +303,3 @@ static int __init kobject_uevent_init(void) 


postcore_initcall(kobject_uevent_init);

#endif
 


#endif /* CONFIG_HOTPLUG */