fbcon: Use static attribute groups for sysfs entries

Using device_create_with_groups() to simplify creation and removal.
Same as commit 1083a7be4504 ("tty: Use static attribute groups for
sysfs entries").

Signed-off-by: Shixiong Ou <oushixiong@kylinos.cn>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 07d127110ca4c9b8b40378c59d7e7518cc5d83fb..ac3c99ed92d1aabb127f8b9d20aafe2790d72b48 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -160,7 +160,6 @@ static int info_idx = -1;
 
 /* console rotation */
 static int initial_rotation = -1;
-static int fbcon_has_sysfs;
 static int margin_color;
 
 static const struct consw fb_con;
@@ -3159,7 +3158,7 @@ static const struct consw fb_con = {
        .con_debug_leave        = fbcon_debug_leave,
 };
 
-static ssize_t store_rotate(struct device *device,
+static ssize_t rotate_store(struct device *device,
                            struct device_attribute *attr, const char *buf,
                            size_t count)
 {
@@ -3181,7 +3180,7 @@ err:
        return count;
 }
 
-static ssize_t store_rotate_all(struct device *device,
+static ssize_t rotate_all_store(struct device *device,
                                struct device_attribute *attr,const char *buf,
                                size_t count)
 {
@@ -3203,7 +3202,7 @@ err:
        return count;
 }
 
-static ssize_t show_rotate(struct device *device,
+static ssize_t rotate_show(struct device *device,
                           struct device_attribute *attr,char *buf)
 {
        struct fb_info *info;
@@ -3222,7 +3221,7 @@ err:
        return sysfs_emit(buf, "%d\n", rotate);
 }
 
-static ssize_t show_cursor_blink(struct device *device,
+static ssize_t cursor_blink_show(struct device *device,
                                 struct device_attribute *attr, char *buf)
 {
        struct fb_info *info;
@@ -3247,7 +3246,7 @@ err:
        return sysfs_emit(buf, "%d\n", blink);
 }
 
-static ssize_t store_cursor_blink(struct device *device,
+static ssize_t cursor_blink_store(struct device *device,
                                  struct device_attribute *attr,
                                  const char *buf, size_t count)
 {
@@ -3281,35 +3280,18 @@ err:
        return count;
 }
 
-static struct device_attribute device_attrs[] = {
-       __ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),
-       __ATTR(rotate_all, S_IWUSR, NULL, store_rotate_all),
-       __ATTR(cursor_blink, S_IRUGO|S_IWUSR, show_cursor_blink,
-              store_cursor_blink),
-};
-
-static int fbcon_init_device(void)
-{
-       int i, error = 0;
+static DEVICE_ATTR_RW(cursor_blink);
+static DEVICE_ATTR_RW(rotate);
+static DEVICE_ATTR_WO(rotate_all);
 
-       fbcon_has_sysfs = 1;
-
-       for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
-               error = device_create_file(fbcon_device, &device_attrs[i]);
-
-               if (error)
-                       break;
-       }
-
-       if (error) {
-               while (--i >= 0)
-                       device_remove_file(fbcon_device, &device_attrs[i]);
-
-               fbcon_has_sysfs = 0;
-       }
+static struct attribute *fbcon_device_attrs[] = {
+       &dev_attr_cursor_blink.attr,
+       &dev_attr_rotate.attr,
+       &dev_attr_rotate_all.attr,
+       NULL
+};
 
-       return 0;
-}
+ATTRIBUTE_GROUPS(fbcon_device);
 
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
 static void fbcon_register_existing_fbs(struct work_struct *work)
@@ -3367,16 +3349,16 @@ void __init fb_console_init(void)
        int i;
 
        console_lock();
-       fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
-                                    "fbcon");
+       fbcon_device = device_create_with_groups(fb_class, NULL,
+                                                MKDEV(0, 0), NULL,
+                                                fbcon_device_groups, "fbcon");
 
        if (IS_ERR(fbcon_device)) {
                printk(KERN_WARNING "Unable to create device "
                       "for fbcon; errno = %ld\n",
                       PTR_ERR(fbcon_device));
                fbcon_device = NULL;
-       } else
-               fbcon_init_device();
+       }
 
        for (i = 0; i < MAX_NR_CONSOLES; i++)
                con2fb_map[i] = -1;
@@ -3387,18 +3369,6 @@ void __init fb_console_init(void)
 
 #ifdef MODULE
 
-static void __exit fbcon_deinit_device(void)
-{
-       int i;
-
-       if (fbcon_has_sysfs) {
-               for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
-                       device_remove_file(fbcon_device, &device_attrs[i]);
-
-               fbcon_has_sysfs = 0;
-       }
-}
-
 void __exit fb_console_exit(void)
 {
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
@@ -3411,7 +3381,6 @@ void __exit fb_console_exit(void)
 #endif
 
        console_lock();
-       fbcon_deinit_device();
        device_destroy(fb_class, MKDEV(0, 0));
 
        do_unregister_con_driver(&fb_con);