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

Driver core: remove subsys_get() 



There are no more subsystems, it's a kset now so remove the function and
the only two users, which are in the driver core.


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

drivers/base/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe); 


struct bus_type *get_bus(struct bus_type *bus)

{

	return bus ? container_of(subsys_get(&bus->subsys),

	return bus ? container_of(kset_get(&bus->subsys),

				struct bus_type, subsys) : NULL;

}

drivers/base/class.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr) 
static struct class *class_get(struct class *cls)

{

	if (cls)

		return container_of(subsys_get(&cls->subsys), struct class, subsys);

		return container_of(kset_get(&cls->subsys), struct class, subsys);

	return NULL;

}

include/linux/kobject.h

+0 −7
Original line number Diff line number Diff line
@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *); 
extern int __must_check subsystem_register(struct kset *);

extern void subsystem_unregister(struct kset *);



static inline struct kset *subsys_get(struct kset *s)

{

	if (s)

		return kset_get(s);

	return NULL;

}



struct subsys_attribute {

	struct attribute attr;

	ssize_t (*show)(struct kset *, char *);

lib/kobject.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a) 
	if (!s || !a)

		return -EINVAL;



	if (subsys_get(s)) {

	if (kset_get(s)) {

		error = sysfs_create_file(&s->kobj, &a->attr);

		kset_put(s);

	}