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

Driver core: remove subsys_set_kset 



This macro is only used by the driver core and is held over from when we
had subsystems.  It is not needed anymore.


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6a8d8abb

drivers/base/bus.c

+2 −1
Original line number Diff line number Diff line
@@ -823,7 +823,8 @@ int bus_register(struct bus_type * bus) 
	if (retval)

		goto out;



	subsys_set_kset(bus, bus_subsys);

	bus->subsys.kobj.kset = &bus_subsys;



	retval = subsystem_register(&bus->subsys);

	if (retval)

		goto out;

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int class_register(struct class * cls) 
	if (error)

		return error;



	subsys_set_kset(cls, class_subsys);

	cls->subsys.kobj.kset = &class_subsys;



	error = subsystem_register(&cls->subsys);

	if (!error) {

include/linux/kobject.h

+0 −13
Original line number Diff line number Diff line
@@ -241,19 +241,6 @@ extern struct kset hypervisor_subsys; 
#define kset_set_kset_s(obj,subsys) \

	(obj)->kset.kobj.kset = &(subsys)



/**

 *	subsys_set_kset(obj,subsys) - set kset for subsystem

 *	@obj:		ptr to some object type.

 *	@_subsys:	a subsystem object (not a ptr).

 *

 *	Can be used for any object type with an embedded ->subsys.

 *	Sets the kset of @obj's kobject to @subsys.kset. This makes

 *	the object a member of that kset.

 */



#define subsys_set_kset(obj,_subsys) \

	(obj)->subsys.kobj.kset = &(_subsys)



extern void subsystem_init(struct kset *);

extern int __must_check subsystem_register(struct kset *);

extern void subsystem_unregister(struct kset *);