13 files changed, 62 insertions, 29 deletions

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 43320925c4ce..2c371c07f0da 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -376,8 +376,11 @@ static const struct of_device_id bw2_match[] = {
 MODULE_DEVICE_TABLE(of, bw2_match);
 
 static struct of_platform_driver bw2_driver = {
-        .name           = "bw2",
-        .match_table    = bw2_match,
+        .driver = {
+                .name = "bw2",
+                .owner = THIS_MODULE,
+                .of_match_table = bw2_match,
+        },
         .probe          = bw2_probe,
         .remove         = __devexit_p(bw2_remove),
 };
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 77a040af20a7..d12e05b6e63f 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -596,8 +596,11 @@ static const struct of_device_id cg14_match[] = {
 MODULE_DEVICE_TABLE(of, cg14_match);
 
 static struct of_platform_driver cg14_driver = {
-        .name           = "cg14",
-        .match_table    = cg14_match,
+        .driver = {
+                .name = "cg14",
+                .owner = THIS_MODULE,
+                .of_match_table = cg14_match,
+        },
         .probe          = cg14_probe,
         .remove         = __devexit_p(cg14_remove),
 };
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 30eedf79322c..b98f93f7f663 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -463,8 +463,11 @@ static const struct of_device_id cg3_match[] = {
 MODULE_DEVICE_TABLE(of, cg3_match);
 
 static struct of_platform_driver cg3_driver = {
-        .name           = "cg3",
-        .match_table    = cg3_match,
+        .driver = {
+                .name = "cg3",
+                .owner = THIS_MODULE,
+                .of_match_table = cg3_match,
+        },
         .probe          = cg3_probe,
         .remove         = __devexit_p(cg3_remove),
 };
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 7f59b0fe5dc2..480d761a27a8 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -856,8 +856,11 @@ static const struct of_device_id cg6_match[] = {
 MODULE_DEVICE_TABLE(of, cg6_match);
 
 static struct of_platform_driver cg6_driver = {
-        .name           = "cg6",
-        .match_table    = cg6_match,
+        .driver = {
+                .name = "cg6",
+                .owner = THIS_MODULE,
+                .of_match_table = cg6_match,
+        },
         .probe          = cg6_probe,
         .remove         = __devexit_p(cg6_remove),
 };
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index ddd46f71e250..95c0227f47fc 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1053,8 +1053,11 @@ static const struct of_device_id ffb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 
 static struct of_platform_driver ffb_driver = {
-        .name           = "ffb",
-        .match_table    = ffb_match,
+        .driver = {
+                .name = "ffb",
+                .owner = THIS_MODULE,
+                .of_match_table = ffb_match,
+        },
         .probe          = ffb_probe,
         .remove         = __devexit_p(ffb_remove),
 };
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 930a2522a631..27455ce298b7 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1647,9 +1647,11 @@ static struct of_device_id fsl_diu_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_diu_match);
 
 static struct of_platform_driver fsl_diu_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "fsl_diu",
-        .match_table    = fsl_diu_match,
+        .driver = {
+                .name = "fsl_diu",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_diu_match,
+        },
         .probe          = fsl_diu_probe,
         .remove         = fsl_diu_remove,
         .suspend        = fsl_diu_suspend,
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 1db55f128490..3d7895316eaf 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -663,8 +663,11 @@ static const struct of_device_id leo_match[] = {
 MODULE_DEVICE_TABLE(of, leo_match);
 
 static struct of_platform_driver leo_driver = {
-        .name           = "leo",
-        .match_table    = leo_match,
+        .driver = {
+                .name = "leo",
+                .owner = THIS_MODULE,
+                .of_match_table = leo_match,
+        },
         .probe          = leo_probe,
         .remove         = __devexit_p(leo_remove),
 };
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c
index 8280a58a0e55..0540de4f5cb4 100644
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -718,9 +718,11 @@ static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = {
 };
 
 static struct of_platform_driver of_platform_mb862xxfb_driver = {
-        .owner          = THIS_MODULE,
-        .name           = DRV_NAME,
-        .match_table    = of_platform_mb862xx_tbl,
+        .driver = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = of_platform_mb862xx_tbl,
+        },
         .probe          = of_platform_mb862xx_probe,
         .remove         = __devexit_p(of_platform_mb862xx_remove),
 };
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 81440f2b9091..c85dd408a9b8 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -353,8 +353,11 @@ static const struct of_device_id p9100_match[] = {
 MODULE_DEVICE_TABLE(of, p9100_match);
 
 static struct of_platform_driver p9100_driver = {
-        .name           = "p9100",
-        .match_table    = p9100_match,
+        .driver = {
+                .name = "p9100",
+                .owner = THIS_MODULE,
+                .of_match_table = p9100_match,
+        },
         .probe          = p9100_probe,
         .remove         = __devexit_p(p9100_remove),
 };
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 69d78d50f0f6..72a1f4c04732 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -679,8 +679,11 @@ static struct of_device_id platinumfb_match[] =
 
 static struct of_platform_driver platinum_driver = 
 {
-        .name           = "platinumfb",
-        .match_table    = platinumfb_match,
+        .driver = {
+                .name = "platinumfb",
+                .owner = THIS_MODULE,
+                .of_match_table = platinumfb_match,
+        },
         .probe          = platinumfb_probe,
         .remove         = platinumfb_remove,
 };
diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c
index ad92a200fafa..489b44e8db81 100644
--- a/drivers/video/sunxvr1000.c
+++ b/drivers/video/sunxvr1000.c
@@ -199,10 +199,13 @@ static const struct of_device_id gfb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 
 static struct of_platform_driver gfb_driver = {
-        .name           = "gfb",
-        .match_table    = gfb_match,
         .probe          = gfb_probe,
         .remove         = __devexit_p(gfb_remove),
+        .driver = {
+                .name           = "gfb",
+                .owner          = THIS_MODULE,
+                .of_match_table = gfb_match,
+        },
 };
 
 static int __init gfb_init(void)
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index c0c2b18fcdcf..ef7a7bd8b503 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -512,8 +512,11 @@ static const struct of_device_id tcx_match[] = {
 MODULE_DEVICE_TABLE(of, tcx_match);
 
 static struct of_platform_driver tcx_driver = {
-        .name           = "tcx",
-        .match_table    = tcx_match,
+        .driver = {
+                .name = "tcx",
+                .owner = THIS_MODULE,
+                .of_match_table = tcx_match,
+        },
         .probe          = tcx_probe,
         .remove         = __devexit_p(tcx_remove),
 };
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 6fcec553662c..574dc54e12d4 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -492,13 +492,12 @@ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
 
 static struct of_platform_driver xilinxfb_of_driver = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_NAME,
-        .match_table = xilinxfb_of_match,
         .probe = xilinxfb_of_probe,
         .remove = __devexit_p(xilinxfb_of_remove),
         .driver = {
                 .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = xilinxfb_of_match,
         },
 };