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

Commit 12e339ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Kset: remove kset_add function 



No one is calling this anymore, so just remove it and hard-code the one
internal-use of it.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d06adfa

include/linux/kobject.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ struct kset { 
};



extern void kset_init(struct kset * k);

extern int __must_check kset_add(struct kset * k);

extern int __must_check kset_register(struct kset * k);

extern void kset_unregister(struct kset * k);

extern struct kset * __must_check kset_create_and_add(const char *name,

lib/kobject.c

+1 −12
Original line number Diff line number Diff line
@@ -709,17 +709,6 @@ struct sysfs_ops kobj_sysfs_ops = { 
	.store	= kobj_attr_store,

};



/**

 *	kset_add - add a kset object to the hierarchy.

 *	@k:	kset.

 */



int kset_add(struct kset * k)

{

	return kobject_add_internal(&k->kobj);

}





/**

 *	kset_register - initialize and add a kset.

 *	@k:	kset.
@@ -733,7 +722,7 @@ int kset_register(struct kset * k) 
		return -EINVAL;



	kset_init(k);

	err = kset_add(k);

	err = kobject_add_internal(&k->kobj);

	if (err)

		return err;

	kobject_uevent(&k->kobj, KOBJ_ADD);