misc: Add attribute groups

Add groups field to struct miscdevice for passing the attribute groups
at device creation.  In this way, the driver can avoid the manual call
of device_create_file() after the device registration, which is
basically a racy operation, in addition to the reduction of manual
device_remove_file() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index c892c296a4dea06c07cc7ecfc206e87ba4baab56..5bb3a2109ab729c260767455c17016876a2f5e1d 100644 (file)
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -207,8 +207,9 @@ int misc_register(struct miscdevice * misc)
 
        dev = MKDEV(MISC_MAJOR, misc->minor);
 
-       misc->this_device = device_create(misc_class, misc->parent, dev,
-                                         misc, "%s", misc->name);
+       misc->this_device =
+               device_create_with_groups(misc_class, misc->parent, dev,
+                                         misc, misc->groups, "%s", misc->name);
        if (IS_ERR(misc->this_device)) {
                int i = DYNAMIC_MINORS - misc->minor - 1;
                if (i < DYNAMIC_MINORS && i >= 0)

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index ee80dd7d9f60fb6e289f798d37b8725d55a71d02..819077c326901384ec3bdb8d16217a1363ab8e28 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -52,6 +52,7 @@
 #define MISC_DYNAMIC_MINOR     255
 
 struct device;
+struct attribute_group;
 
 struct miscdevice  {
        int minor;
@@ -60,6 +61,7 @@ struct miscdevice  {
        struct list_head list;
        struct device *parent;
        struct device *this_device;
+       const struct attribute_group **groups;
        const char *nodename;
        umode_t mode;
 };