diff options
Diffstat (limited to 'drivers/media/video/fsl-viu.c')
-rw-r--r-- | drivers/media/video/fsl-viu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c index e4bba88254c7..031af1610154 100644 --- a/drivers/media/video/fsl-viu.c +++ b/drivers/media/video/fsl-viu.c | |||
@@ -1445,8 +1445,7 @@ static struct video_device viu_template = { | |||
1445 | .current_norm = V4L2_STD_NTSC_M, | 1445 | .current_norm = V4L2_STD_NTSC_M, |
1446 | }; | 1446 | }; |
1447 | 1447 | ||
1448 | static int __devinit viu_of_probe(struct platform_device *op, | 1448 | static int __devinit viu_of_probe(struct platform_device *op) |
1449 | const struct of_device_id *match) | ||
1450 | { | 1449 | { |
1451 | struct viu_dev *viu_dev; | 1450 | struct viu_dev *viu_dev; |
1452 | struct video_device *vdev; | 1451 | struct video_device *vdev; |
@@ -1627,7 +1626,7 @@ static struct of_device_id mpc512x_viu_of_match[] = { | |||
1627 | }; | 1626 | }; |
1628 | MODULE_DEVICE_TABLE(of, mpc512x_viu_of_match); | 1627 | MODULE_DEVICE_TABLE(of, mpc512x_viu_of_match); |
1629 | 1628 | ||
1630 | static struct of_platform_driver viu_of_platform_driver = { | 1629 | static struct platform_driver viu_of_platform_driver = { |
1631 | .probe = viu_of_probe, | 1630 | .probe = viu_of_probe, |
1632 | .remove = __devexit_p(viu_of_remove), | 1631 | .remove = __devexit_p(viu_of_remove), |
1633 | #ifdef CONFIG_PM | 1632 | #ifdef CONFIG_PM |
@@ -1643,12 +1642,12 @@ static struct of_platform_driver viu_of_platform_driver = { | |||
1643 | 1642 | ||
1644 | static int __init viu_init(void) | 1643 | static int __init viu_init(void) |
1645 | { | 1644 | { |
1646 | return of_register_platform_driver(&viu_of_platform_driver); | 1645 | return platform_driver_register(&viu_of_platform_driver); |
1647 | } | 1646 | } |
1648 | 1647 | ||
1649 | static void __exit viu_exit(void) | 1648 | static void __exit viu_exit(void) |
1650 | { | 1649 | { |
1651 | of_unregister_platform_driver(&viu_of_platform_driver); | 1650 | platform_driver_unregister(&viu_of_platform_driver); |
1652 | } | 1651 | } |
1653 | 1652 | ||
1654 | module_init(viu_init); | 1653 | module_init(viu_init); |