Driver Core: kill subsys_attribute and default sysfs ops

[linux-2.6-omap-h63xx.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index 1c343fe4ba63d1331f6154f8de338ba5233c4ed7..c742ac25228a078e34032eb01f88f3d928f0c08e 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -626,7 +626,8 @@ static void dynamic_kobj_release(struct kobject *kobj)
 }
 
 static struct kobj_type dynamic_kobj_ktype = {
-       .release = dynamic_kobj_release,
+       .release        = dynamic_kobj_release,
+       .sysfs_ops      = &kobj_sysfs_ops,
 };
 
 /**
@@ -809,26 +810,6 @@ void subsystem_unregister(struct kset *s)
        kset_unregister(s);
 }
 
-/**
- *     subsystem_create_file - export sysfs attribute file.
- *     @s:     subsystem.
- *     @a:     subsystem attribute descriptor.
- */
-
-int subsys_create_file(struct kset *s, struct subsys_attribute *a)
-{
-       int error = 0;
-
-       if (!s || !a)
-               return -EINVAL;
-
-       if (kset_get(s)) {
-               error = sysfs_create_file(&s->kobj, &a->attr);
-               kset_put(s);
-       }
-       return error;
-}
-
 static void kset_release(struct kobject *kobj)
 {
        struct kset *kset = container_of(kobj, struct kset, kobj);
@@ -836,7 +817,8 @@ static void kset_release(struct kobject *kobj)
        kfree(kset);
 }
 
-static struct kobj_type kset_type = {
+static struct kobj_type kset_ktype = {
+       .sysfs_ops      = &kobj_sysfs_ops,
        .release = kset_release,
 };
 
@@ -869,11 +851,11 @@ static struct kset *kset_create(const char *name,
        kset->kobj.parent = parent_kobj;
 
        /*
-        * The kobject of this kset will have a type of kset_type and belong to
+        * The kobject of this kset will have a type of kset_ktype and belong to
         * no kset itself.  That way we can properly free it when it is
         * finished being used.
         */
-       kset->kobj.ktype = &kset_type;
+       kset->kobj.ktype = &kset_ktype;
        kset->kobj.kset = NULL;
 
        return kset;
@@ -925,4 +907,3 @@ EXPORT_SYMBOL(kset_unregister);
 
 EXPORT_SYMBOL(subsystem_register);
 EXPORT_SYMBOL(subsystem_unregister);
-EXPORT_SYMBOL(subsys_create_file);