diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 20:03:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 09:24:45 -0700 |
| commit | 77997aaadd34510ed73153a4cd60161257a9e289 (patch) | |
| tree | ad8ab469f7febb690749e2cae6c5a04b0dc016fc | |
| parent | b0b090e5792fa228b5c825fcc5e1b7b0da7abec9 (diff) | |
| download | kernel_samsung_tuna-77997aaadd34510ed73153a4cd60161257a9e289.zip kernel_samsung_tuna-77997aaadd34510ed73153a4cd60161257a9e289.tar.gz kernel_samsung_tuna-77997aaadd34510ed73153a4cd60161257a9e289.tar.bz2 | |
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: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/video/console/fbcon.c | 4 | ||||
| -rw-r--r-- | drivers/video/display/display-sysfs.c | 9 | ||||
| -rw-r--r-- | drivers/video/fbmem.c | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index da91bb1..0e0ea42 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -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 " diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c index 6ef800b..4830b1b 100644 --- a/drivers/video/display/display-sysfs.c +++ b/drivers/video/display/display-sysfs.c @@ -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; diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 0737570..61b36ca 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -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)); |