git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hid-suspend' into picolcd
[pandora-kernel.git]
/
drivers
/
base
/
sys.c
diff --git
a/drivers/base/sys.c
b/drivers/base/sys.c
index
0d90390
..
9354dc1
100644
(file)
--- a/
drivers/base/sys.c
+++ b/
drivers/base/sys.c
@@
-17,7
+17,6
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/slab.h>
#include <linux/string.h>
#include <linux/pm.h>
#include <linux/device.h>
#include <linux/string.h>
#include <linux/pm.h>
#include <linux/device.h>
@@
-54,7
+53,7
@@
sysdev_store(struct kobject *kobj, struct attribute *attr,
return -EIO;
}
return -EIO;
}
-static struct sysfs_ops sysfs_ops = {
+static
const
struct sysfs_ops sysfs_ops = {
.show = sysdev_show,
.store = sysdev_store,
};
.show = sysdev_show,
.store = sysdev_store,
};
@@
-89,7
+88,7
@@
static ssize_t sysdev_class_show(struct kobject *kobj, struct attribute *attr,
struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
if (class_attr->show)
struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
if (class_attr->show)
- return class_attr->show(class, buffer);
+ return class_attr->show(class,
class_attr,
buffer);
return -EIO;
}
return -EIO;
}
@@
-100,11
+99,11
@@
static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,
struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
if (class_attr->store)
struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
if (class_attr->store)
- return class_attr->store(class, buffer, count);
+ return class_attr->store(class,
class_attr,
buffer, count);
return -EIO;
}
return -EIO;
}
-static struct sysfs_ops sysfs_class_ops = {
+static
const
struct sysfs_ops sysfs_class_ops = {
.show = sysdev_class_show,
.store = sysdev_class_store,
};
.show = sysdev_class_show,
.store = sysdev_class_store,
};
@@
-145,13
+144,20
@@
int sysdev_class_register(struct sysdev_class *cls)
if (retval)
return retval;
if (retval)
return retval;
- return kset_register(&cls->kset);
+ retval = kset_register(&cls->kset);
+ if (!retval && cls->attrs)
+ retval = sysfs_create_files(&cls->kset.kobj,
+ (const struct attribute **)cls->attrs);
+ return retval;
}
void sysdev_class_unregister(struct sysdev_class *cls)
{
pr_debug("Unregistering sysdev class '%s'\n",
kobject_name(&cls->kset.kobj));
}
void sysdev_class_unregister(struct sysdev_class *cls)
{
pr_debug("Unregistering sysdev class '%s'\n",
kobject_name(&cls->kset.kobj));
+ if (cls->attrs)
+ sysfs_remove_files(&cls->kset.kobj,
+ (const struct attribute **)cls->attrs);
kset_unregister(&cls->kset);
}
kset_unregister(&cls->kset);
}