diff options
Diffstat (limited to 'drivers/video/vesafb.c')
-rw-r--r-- | drivers/video/vesafb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index e25eae1a78c1..2c3aa2fcfd91 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c | |||
@@ -245,9 +245,8 @@ static int __init vesafb_setup(char *options) | |||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int __init vesafb_probe(struct device *device) | 248 | static int __init vesafb_probe(struct platform_device *dev) |
249 | { | 249 | { |
250 | struct platform_device *dev = to_platform_device(device); | ||
251 | struct fb_info *info; | 250 | struct fb_info *info; |
252 | int i, err; | 251 | int i, err; |
253 | unsigned int size_vmode; | 252 | unsigned int size_vmode; |
@@ -480,10 +479,11 @@ err: | |||
480 | return err; | 479 | return err; |
481 | } | 480 | } |
482 | 481 | ||
483 | static struct device_driver vesafb_driver = { | 482 | static struct platform_driver vesafb_driver = { |
484 | .name = "vesafb", | ||
485 | .bus = &platform_bus_type, | ||
486 | .probe = vesafb_probe, | 483 | .probe = vesafb_probe, |
484 | .driver = { | ||
485 | .name = "vesafb", | ||
486 | }, | ||
487 | }; | 487 | }; |
488 | 488 | ||
489 | static struct platform_device vesafb_device = { | 489 | static struct platform_device vesafb_device = { |
@@ -498,12 +498,12 @@ static int __init vesafb_init(void) | |||
498 | /* ignore error return of fb_get_options */ | 498 | /* ignore error return of fb_get_options */ |
499 | fb_get_options("vesafb", &option); | 499 | fb_get_options("vesafb", &option); |
500 | vesafb_setup(option); | 500 | vesafb_setup(option); |
501 | ret = driver_register(&vesafb_driver); | 501 | ret = platform_driver_register(&vesafb_driver); |
502 | 502 | ||
503 | if (!ret) { | 503 | if (!ret) { |
504 | ret = platform_device_register(&vesafb_device); | 504 | ret = platform_device_register(&vesafb_device); |
505 | if (ret) | 505 | if (ret) |
506 | driver_unregister(&vesafb_driver); | 506 | platform_driver_unregister(&vesafb_driver); |
507 | } | 507 | } |
508 | return ret; | 508 | return ret; |
509 | } | 509 | } |