rkfb: select current screen in lcdc driver

[firefly-linux-kernel-4.4.55.git] / drivers / video / leo.c

diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index b599e5e36ced7708dc5269cb26b34a265263ff28..9e946e2c1da91fd67e1a3f5198f340f109f79ead 100644 (file)
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -547,8 +547,7 @@ static void leo_unmap_regs(struct platform_device *op, struct fb_info *info,
                of_iounmap(&op->resource[0], info->screen_base, 0x800000);
 }
 
-static int __devinit leo_probe(struct platform_device *op,
-                              const struct of_device_id *match)
+static int __devinit leo_probe(struct platform_device *op)
 {
        struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
@@ -662,7 +661,7 @@ static const struct of_device_id leo_match[] = {
 };
 MODULE_DEVICE_TABLE(of, leo_match);
 
-static struct of_platform_driver leo_driver = {
+static struct platform_driver leo_driver = {
        .driver = {
                .name = "leo",
                .owner = THIS_MODULE,
@@ -677,12 +676,12 @@ static int __init leo_init(void)
        if (fb_get_options("leofb", NULL))
                return -ENODEV;
 
-       return of_register_platform_driver(&leo_driver);
+       return platform_driver_register(&leo_driver);
 }
 
 static void __exit leo_exit(void)
 {
-       of_unregister_platform_driver(&leo_driver);
+       platform_driver_unregister(&leo_driver);
 }
 
 module_init(leo_init);