Driver Core: kill subsys_attribute and default sysfs ops

Remove the no longer needed subsys_attributes, they are all converted to
the more sensical kobj_attributes.

There is no longer a magic fallback in sysfs attribute operations, all
kobjects which create simple attributes need explicitely a ktype
assigned, which tells the core what was intended here.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 387a636627930aa3bdecf5a620261910b4b32040..8acf82bba44c60c14f46317448c792abd19ceb52 100644 (file)
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -20,43 +20,6 @@
 
 #include "sysfs.h"
 
-#define to_sattr(a) container_of(a,struct subsys_attribute, attr)
-
-/*
- * Subsystem file operations.
- * These operations allow subsystems to have files that can be 
- * read/written. 
- */
-static ssize_t 
-subsys_attr_show(struct kobject * kobj, struct attribute * attr, char * page)
-{
-       struct kset *kset = to_kset(kobj);
-       struct subsys_attribute * sattr = to_sattr(attr);
-       ssize_t ret = -EIO;
-
-       if (sattr->show)
-               ret = sattr->show(kset, page);
-       return ret;
-}
-
-static ssize_t 
-subsys_attr_store(struct kobject * kobj, struct attribute * attr, 
-                 const char * page, size_t count)
-{
-       struct kset *kset = to_kset(kobj);
-       struct subsys_attribute * sattr = to_sattr(attr);
-       ssize_t ret = -EIO;
-
-       if (sattr->store)
-               ret = sattr->store(kset, page, count);
-       return ret;
-}
-
-static struct sysfs_ops subsys_sysfs_ops = {
-       .show   = subsys_attr_show,
-       .store  = subsys_attr_store,
-};
-
 /*
  * There's one sysfs_buffer for each open file and one
  * sysfs_open_dirent for each sysfs_dirent with one or more open
@@ -354,29 +317,23 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
 {
        struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
        struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
-       struct sysfs_buffer * buffer;
-       struct sysfs_ops * ops = NULL;
-       int error;
+       struct sysfs_buffer *buffer;
+       struct sysfs_ops *ops;
+       int error = -EACCES;
 
        /* need attr_sd for attr and ops, its parent for kobj */
        if (!sysfs_get_active_two(attr_sd))
                return -ENODEV;
 
-       /* if the kobject has no ktype, then we assume that it is a subsystem
-        * itself, and use ops for it.
-        */
-       if (kobj->ktype)
+       /* every kobject with an attribute needs a ktype assigned */
+       if (kobj->ktype && kobj->ktype->sysfs_ops)
                ops = kobj->ktype->sysfs_ops;
-       else
-               ops = &subsys_sysfs_ops;
-
-       error = -EACCES;
-
-       /* No sysfs operations, either from having no subsystem,
-        * or the subsystem have no operations.
-        */
-       if (!ops)
+       else {
+               printk(KERN_ERR "missing sysfs attribute operations for "
+                      "kobject: %s\n", kobject_name(kobj));
+               WARN_ON(1);
                goto err_out;
+       }
 
        /* File needs write support.
         * The inode's perms must say it's ok, 

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 29dc444e3361b99659c892bd9d6f7f4f6ccc9e42..29841bb5badb248adebd74069fe05859da1ce85d 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -216,15 +216,6 @@ extern struct kset *firmware_kset;
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);
 
-struct subsys_attribute {
-       struct attribute attr;
-       ssize_t (*show)(struct kset *, char *);
-       ssize_t (*store)(struct kset *, const char *, size_t);
-};
-
-extern int __must_check subsys_create_file(struct kset *,
-                                       struct subsys_attribute *);
-
 #if defined(CONFIG_HOTPLUG)
 int kobject_uevent(struct kobject *kobj, enum kobject_action action);
 int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,

diff --git a/lib/kobject.c b/lib/kobject.c
index 99f6354a57511ddfd4c805cdaa3803a3bfdb8bd2..c742ac25228a078e34032eb01f88f3d928f0c08e 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -810,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);
@@ -927,4 +907,3 @@ EXPORT_SYMBOL(kset_unregister);
 
 EXPORT_SYMBOL(subsystem_register);
 EXPORT_SYMBOL(subsystem_unregister);
-EXPORT_SYMBOL(subsys_create_file);