Skip to content

Commit

Permalink
device create: video: convert device_create_drvdata to device_create
Browse files Browse the repository at this point in the history
Now that device_create() has been audited, rename things back to the
original call to be sane.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Oct 16, 2008
1 parent b0b090e commit 77997aa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -3573,8 +3573,8 @@ static int __init fb_console_init(void)

acquire_console_sem();
fb_register_client(&fbcon_event_notifier);
fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0),
NULL, "fbcon");
fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
"fbcon");

if (IS_ERR(fbcon_device)) {
printk(KERN_WARNING "Unable to create device "
Expand Down
9 changes: 3 additions & 6 deletions drivers/video/display/display-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver,
mutex_unlock(&allocated_dsp_lock);

if (!ret) {
new_dev->dev = device_create_drvdata(display_class,
parent,
MKDEV(0,0),
new_dev,
"display%d",
new_dev->idx);
new_dev->dev = device_create(display_class, parent,
MKDEV(0, 0), new_dev,
"display%d", new_dev->idx);
if (!IS_ERR(new_dev->dev)) {
new_dev->parent = parent;
new_dev->driver = driver;
Expand Down
5 changes: 2 additions & 3 deletions drivers/video/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1443,9 +1443,8 @@ register_framebuffer(struct fb_info *fb_info)
break;
fb_info->node = i;

fb_info->dev = device_create_drvdata(fb_class, fb_info->device,
MKDEV(FB_MAJOR, i), NULL,
"fb%d", i);
fb_info->dev = device_create(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 77997aa

Please sign in to comment.