aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/xilinxfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/xilinxfb.c')
-rw-r--r--drivers/video/xilinxfb.c11
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
407static int __devinit 407static int __devinit xilinxfb_of_probe(struct platform_device *op)
408xilinxfb_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};
506MODULE_DEVICE_TABLE(of, xilinxfb_of_match); 503MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
507 504
508static struct of_platform_driver xilinxfb_of_driver = { 505static 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 = {
523static int __init 520static int __init
524xilinxfb_init(void) 521xilinxfb_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
529static void __exit 526static void __exit
530xilinxfb_cleanup(void) 527xilinxfb_cleanup(void)
531{ 528{
532 of_unregister_platform_driver(&xilinxfb_of_driver); 529 platform_driver_unregister(&xilinxfb_of_driver);
533} 530}
534 531
535module_init(xilinxfb_init); 532module_init(xilinxfb_init);