浏览代码

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: Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman 17 年之前
父节点
当前提交
1ef4cfac01
共有 4 个文件被更改,包括 3 次插入10 次删除
  1. 1 1
      drivers/base/bus.c
  2. 1 1
      drivers/base/class.c
  3. 0 7
      include/linux/kobject.h
  4. 1 1
      lib/kobject.c

+ 1 - 1
drivers/base/bus.c

@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe);
 
 
 struct bus_type *get_bus(struct bus_type *bus)
 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;
 				struct bus_type, subsys) : NULL;
 }
 }
 
 

+ 1 - 1
drivers/base/class.c

@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)
 static struct class *class_get(struct class *cls)
 static struct class *class_get(struct class *cls)
 {
 {
 	if (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;
 	return NULL;
 }
 }
 
 

+ 0 - 7
include/linux/kobject.h

@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(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 subsys_attribute {
 	struct attribute attr;
 	struct attribute attr;
 	ssize_t (*show)(struct kset *, char *);
 	ssize_t (*show)(struct kset *, char *);

+ 1 - 1
lib/kobject.c

@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
 	if (!s || !a)
 	if (!s || !a)
 		return -EINVAL;
 		return -EINVAL;
 
 
-	if (subsys_get(s)) {
+	if (kset_get(s)) {
 		error = sysfs_create_file(&s->kobj, &a->attr);
 		error = sysfs_create_file(&s->kobj, &a->attr);
 		kset_put(s);
 		kset_put(s);
 	}
 	}