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>
This commit is contained in:
parent
6e9d930d16
commit
1ef4cfac01
4 changed files with 3 additions and 10 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 *);
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue