Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e274401 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e282959e

drivers/video/console/fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -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 "

drivers/video/fbmem.c

+3 −2
Original line number Diff line number Diff line
@@ -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));