The 'enable' attribute is needed for all timed_output_class devices.
It can thus be created automatically when creating the timed_output device.
This simplifies the code and ensures that the attribute exists when the
udev event announcing device registration is generated.
Signed-off-by: Guenter Roeck <li...@roeck-us.net>
---
v2: I realized there was a reason to support creating the class from
timed_output_dev_register(), since it is not guaranteed that the driver
initialization function has been executed when it is called and the driver
is built into the kernel. Restore that code.
drivers/staging/android/timed_output.c | 54 +++++++++++++++-----------------
1 file changed, 26 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/android/timed_output.c
b/drivers/staging/android/timed_output.c
index ee3a57f..79fcaa2 100644
--- a/drivers/staging/android/timed_output.c
+++ b/drivers/staging/android/timed_output.c
@@ -24,7 +24,7 @@
#include "timed_output.h"
-static struct class *timed_output_class;
+static bool class_registered;
static atomic_t device_count;
static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
@@ -51,15 +51,25 @@ static ssize_t enable_store(
return size;
}
-static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store);
+static struct device_attribute timed_output_attrs[] = {
+ __ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store),
+ { }
+};
-static int create_timed_output_class(void)
+static struct class timed_output_class = {
+ .owner = THIS_MODULE,
+ .name = "timed_output",
+ .dev_attrs = timed_output_attrs,
+};
+
+static int register_timed_output_class(void)
{
- if (!timed_output_class) {
- timed_output_class = class_create(THIS_MODULE, "timed_output");
- if (IS_ERR(timed_output_class))
- return PTR_ERR(timed_output_class);
+ if (!class_registered) {
+ int ret = class_register(&timed_output_class);
+ if (ret)
+ return ret;
atomic_set(&device_count, 0);
+ class_registered = true;
}
return 0;
@@ -72,50 +82,38 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
if (!tdev || !tdev->name || !tdev->enable || !tdev->get_time)
return -EINVAL;
- ret = create_timed_output_class();
+ ret = register_timed_output_class();
if (ret < 0)
return ret;
+ tdev->state = 0;
tdev->index = atomic_inc_return(&device_count);
- tdev->dev = device_create(timed_output_class, NULL,
- MKDEV(0, tdev->index), NULL, "%s", tdev->name);
+ tdev->dev = device_create(&timed_output_class, NULL,
+ MKDEV(0, tdev->index), tdev, "%s",
+ tdev->name);
if (IS_ERR(tdev->dev))
return PTR_ERR(tdev->dev);
- ret = device_create_file(tdev->dev, &dev_attr_enable);
- if (ret < 0)
- goto err_create_file;
-
- dev_set_drvdata(tdev->dev, tdev);
- tdev->state = 0;
return 0;
-
-err_create_file:
- device_destroy(timed_output_class, MKDEV(0, tdev->index));
- pr_err("failed to register driver %s\n",
- tdev->name);
-
- return ret;
}
EXPORT_SYMBOL_GPL(timed_output_dev_register);
void timed_output_dev_unregister(struct timed_output_dev *tdev)
{
tdev->enable(tdev, 0);
- device_remove_file(tdev->dev, &dev_attr_enable);
- device_destroy(timed_output_class, MKDEV(0, tdev->index));
- dev_set_drvdata(tdev->dev, NULL);
+ device_destroy(&timed_output_class, MKDEV(0, tdev->index));
}
EXPORT_SYMBOL_GPL(timed_output_dev_unregister);
static int __init timed_output_init(void)
{
- return create_timed_output_class();
+ return register_timed_output_class();
}
static void __exit timed_output_exit(void)
{
- class_destroy(timed_output_class);
+ class_unregister(&timed_output_class);
+ class_registered = false;
}
module_init(timed_output_init);
--
1.7.9.7
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
