Commit 77997aaa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

device create: video: convert device_create_drvdata to device_create

Now that device_create() has been audited, rename things back to the
original call to be sane.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b0b090e5
...@@ -3573,8 +3573,8 @@ static int __init fb_console_init(void) ...@@ -3573,8 +3573,8 @@ static int __init fb_console_init(void)
acquire_console_sem(); acquire_console_sem();
fb_register_client(&fbcon_event_notifier); fb_register_client(&fbcon_event_notifier);
fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0), fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
NULL, "fbcon"); "fbcon");
if (IS_ERR(fbcon_device)) { if (IS_ERR(fbcon_device)) {
printk(KERN_WARNING "Unable to create device " printk(KERN_WARNING "Unable to create device "
......
...@@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver, ...@@ -153,12 +153,9 @@ struct display_device *display_device_register(struct display_driver *driver,
mutex_unlock(&allocated_dsp_lock); mutex_unlock(&allocated_dsp_lock);
if (!ret) { if (!ret) {
new_dev->dev = device_create_drvdata(display_class, new_dev->dev = device_create(display_class, parent,
parent, MKDEV(0, 0), new_dev,
MKDEV(0,0), "display%d", new_dev->idx);
new_dev,
"display%d",
new_dev->idx);
if (!IS_ERR(new_dev->dev)) { if (!IS_ERR(new_dev->dev)) {
new_dev->parent = parent; new_dev->parent = parent;
new_dev->driver = driver; new_dev->driver = driver;
......
...@@ -1443,9 +1443,8 @@ register_framebuffer(struct fb_info *fb_info) ...@@ -1443,9 +1443,8 @@ register_framebuffer(struct fb_info *fb_info)
break; break;
fb_info->node = i; fb_info->node = i;
fb_info->dev = device_create_drvdata(fb_class, fb_info->device, fb_info->dev = device_create(fb_class, fb_info->device,
MKDEV(FB_MAJOR, i), NULL, MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
"fb%d", i);
if (IS_ERR(fb_info->dev)) { if (IS_ERR(fb_info->dev)) {
/* Not fatal */ /* Not fatal */
printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev)); printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment