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/xilinxfb.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/xilinxfb.c')
-rw-r--r-- | drivers/video/xilinxfb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 68bd23476c64..77dea015ff69 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
@@ -404,8 +404,7 @@ static int xilinxfb_release(struct device *dev) | |||
404 | * OF bus binding | 404 | * OF bus binding |
405 | */ | 405 | */ |
406 | 406 | ||
407 | static int __devinit | 407 | static int __devinit xilinxfb_of_probe(struct platform_device *op) |
408 | xilinxfb_of_probe(struct platform_device *op, const struct of_device_id *match) | ||
409 | { | 408 | { |
410 | const u32 *prop; | 409 | const u32 *prop; |
411 | u32 *p; | 410 | u32 *p; |
@@ -418,8 +417,6 @@ xilinxfb_of_probe(struct platform_device *op, const struct of_device_id *match) | |||
418 | /* Copy with the default pdata (not a ptr reference!) */ | 417 | /* Copy with the default pdata (not a ptr reference!) */ |
419 | pdata = xilinx_fb_default_pdata; | 418 | pdata = xilinx_fb_default_pdata; |
420 | 419 | ||
421 | dev_dbg(&op->dev, "xilinxfb_of_probe(%p, %p)\n", op, match); | ||
422 | |||
423 | /* Allocate the driver data region */ | 420 | /* Allocate the driver data region */ |
424 | drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); | 421 | drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); |
425 | if (!drvdata) { | 422 | if (!drvdata) { |
@@ -505,7 +502,7 @@ static struct of_device_id xilinxfb_of_match[] __devinitdata = { | |||
505 | }; | 502 | }; |
506 | MODULE_DEVICE_TABLE(of, xilinxfb_of_match); | 503 | MODULE_DEVICE_TABLE(of, xilinxfb_of_match); |
507 | 504 | ||
508 | static struct of_platform_driver xilinxfb_of_driver = { | 505 | static struct platform_driver xilinxfb_of_driver = { |
509 | .probe = xilinxfb_of_probe, | 506 | .probe = xilinxfb_of_probe, |
510 | .remove = __devexit_p(xilinxfb_of_remove), | 507 | .remove = __devexit_p(xilinxfb_of_remove), |
511 | .driver = { | 508 | .driver = { |
@@ -523,13 +520,13 @@ static struct of_platform_driver xilinxfb_of_driver = { | |||
523 | static int __init | 520 | static int __init |
524 | xilinxfb_init(void) | 521 | xilinxfb_init(void) |
525 | { | 522 | { |
526 | return of_register_platform_driver(&xilinxfb_of_driver); | 523 | return platform_driver_register(&xilinxfb_of_driver); |
527 | } | 524 | } |
528 | 525 | ||
529 | static void __exit | 526 | static void __exit |
530 | xilinxfb_cleanup(void) | 527 | xilinxfb_cleanup(void) |
531 | { | 528 | { |
532 | of_unregister_platform_driver(&xilinxfb_of_driver); | 529 | platform_driver_unregister(&xilinxfb_of_driver); |
533 | } | 530 | } |
534 | 531 | ||
535 | module_init(xilinxfb_init); | 532 | module_init(xilinxfb_init); |