device create: framebuffer: convert device_create to device_create_drvdata

device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.

Cc: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 97aff8db10bf..4be3b46c069b 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3586,7 +3586,8 @@ static int __init fb_console_init(void)
 
         acquire_console_sem();
         fb_register_client(&fbcon_event_notifier);
-        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), "fbcon");
+        fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0),
+                                             NULL, "fbcon");
 
         if (IS_ERR(fbcon_device)) {
                 printk(KERN_WARNING "Unable to create device "
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 33ebdb198daf..1cd5071e5362 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1439,8 +1439,9 @@ register_framebuffer(struct fb_info *fb_info)
                         break;
         fb_info->node = i;
 
-        fb_info->dev = device_create(fb_class, fb_info->device,
-                                     MKDEV(FB_MAJOR, i), "fb%d", i);
+        fb_info->dev = device_create_drvdata(fb_class, fb_info->device,
+                                             MKDEV(FB_MAJOR, i), NULL,
+                                             "fb%d", i);
         if (IS_ERR(fb_info->dev)) {
                 /* Not fatal */
                 printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));