diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:07:43 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:45 -0500 |
commit | 28541d0f1894cd0c8f4a90c6e006c88d38ad3ac0 (patch) | |
tree | 9d735279860b9f5e499cdf8bd67bf790c92dbebd /drivers/video/cg3.c | |
parent | 74888760d40b3ac9054f9c5fa07b566c0676ba2d (diff) |
dt/video: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/video. The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/video/cg3.c')
-rw-r--r-- | drivers/video/cg3.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 09c0c3c42482..f927a7b1a8d4 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -346,8 +346,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par) | |||
346 | return 0; | 346 | return 0; |
347 | } | 347 | } |
348 | 348 | ||
349 | static int __devinit cg3_probe(struct platform_device *op, | 349 | static int __devinit cg3_probe(struct platform_device *op) |
350 | const struct of_device_id *match) | ||
351 | { | 350 | { |
352 | struct device_node *dp = op->dev.of_node; | 351 | struct device_node *dp = op->dev.of_node; |
353 | struct fb_info *info; | 352 | struct fb_info *info; |
@@ -462,7 +461,7 @@ static const struct of_device_id cg3_match[] = { | |||
462 | }; | 461 | }; |
463 | MODULE_DEVICE_TABLE(of, cg3_match); | 462 | MODULE_DEVICE_TABLE(of, cg3_match); |
464 | 463 | ||
465 | static struct of_platform_driver cg3_driver = { | 464 | static struct platform_driver cg3_driver = { |
466 | .driver = { | 465 | .driver = { |
467 | .name = "cg3", | 466 | .name = "cg3", |
468 | .owner = THIS_MODULE, | 467 | .owner = THIS_MODULE, |
@@ -477,12 +476,12 @@ static int __init cg3_init(void) | |||
477 | if (fb_get_options("cg3fb", NULL)) | 476 | if (fb_get_options("cg3fb", NULL)) |
478 | return -ENODEV; | 477 | return -ENODEV; |
479 | 478 | ||
480 | return of_register_platform_driver(&cg3_driver); | 479 | return platform_driver_register(&cg3_driver); |
481 | } | 480 | } |
482 | 481 | ||
483 | static void __exit cg3_exit(void) | 482 | static void __exit cg3_exit(void) |
484 | { | 483 | { |
485 | of_unregister_platform_driver(&cg3_driver); | 484 | platform_driver_unregister(&cg3_driver); |
486 | } | 485 | } |
487 | 486 | ||
488 | module_init(cg3_init); | 487 | module_init(cg3_init); |