Skip to content

Commit

Permalink
device create: framebuffer: convert device_create to device_create_dr…
Browse files Browse the repository at this point in the history
…vdata

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>
  • Loading branch information
Greg Kroah-Hartman committed Jul 22, 2008
1 parent e282959 commit 1e27440
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
5 changes: 3 additions & 2 deletions drivers/video/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 1e27440

Please sign in to comment.