fbdev: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/video/fbdev to use .remove(),
with the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
index 13263824052181a1b7c2d2d618983be40cec4749..1116a0789ca4d39e9dc5fbc55683dd0a5b769c9f 100644 (file)
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -3774,8 +3774,8 @@ static void __exit amifb_remove(struct platform_device *pdev)
  * triggers a section mismatch warning.
  */
 static struct platform_driver amifb_driver __refdata = {
-       .remove_new = __exit_p(amifb_remove),
-       .driver   = {
+       .remove = __exit_p(amifb_remove),
+       .driver = {
                .name   = "amiga-video",
        },
 };

diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
index b2408543277cee9040d1d7027ae337b821619caf..b807cf07522de1ffbab9719b99f0587fd90aece4 100644 (file)
--- a/drivers/video/fbdev/arcfb.c
+++ b/drivers/video/fbdev/arcfb.c
@@ -548,7 +548,7 @@ static void arcfb_remove(struct platform_device *dev)
 
 static struct platform_driver arcfb_driver = {
        .probe  = arcfb_probe,
-       .remove_new = arcfb_remove,
+       .remove = arcfb_remove,
        .driver = {
                .name   = "arcfb",
        },

diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 5574fb0361ee3b87244732c0f3cdf15a76223b13..e13f53965a0d4e621eeaf731e0415ec60aba0ef0 100644 (file)
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1299,7 +1299,7 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
 
 static struct platform_driver atmel_lcdfb_driver = {
        .probe          = atmel_lcdfb_probe,
-       .remove_new     = atmel_lcdfb_remove,
+       .remove         = atmel_lcdfb_remove,
        .suspend        = atmel_lcdfb_suspend,
        .resume         = atmel_lcdfb_resume,
        .driver         = {

diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c
index 08109ce535cd4e9a8396bfd62ca751572ecb58c4..840f221607635bfe3c8a9860ede7ebd2004cc7a6 100644 (file)
--- a/drivers/video/fbdev/au1100fb.c
+++ b/drivers/video/fbdev/au1100fb.c
@@ -588,7 +588,7 @@ static struct platform_driver au1100fb_driver = {
                .name           = "au1100-lcd",
        },
        .probe          = au1100fb_drv_probe,
-       .remove_new     = au1100fb_drv_remove,
+       .remove         = au1100fb_drv_remove,
        .suspend        = au1100fb_drv_suspend,
        .resume         = au1100fb_drv_resume,
 };

diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index e718fea636628ad3a87459c13dace85b52bb15a9..ed770222660b515fde3ca95ae41ea7ebff6be7c3 100644 (file)
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -1833,7 +1833,7 @@ static struct platform_driver au1200fb_driver = {
                .pm     = AU1200FB_PMOPS,
        },
        .probe          = au1200fb_drv_probe,
-       .remove_new     = au1200fb_drv_remove,
+       .remove         = au1200fb_drv_remove,
 };
 module_platform_driver(au1200fb_driver);
 

diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index e857b15e9f5deb3ae28df0fd2c4775d83706016e..c8ba098a8c42f34ce56e65db1b0c8dcd602f4f17 100644 (file)
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -1151,7 +1151,7 @@ static void broadsheetfb_remove(struct platform_device *dev)
 
 static struct platform_driver broadsheetfb_driver = {
        .probe  = broadsheetfb_probe,
-       .remove_new = broadsheetfb_remove,
+       .remove = broadsheetfb_remove,
        .driver = {
                .name   = "broadsheetfb",
        },

diff --git a/drivers/video/fbdev/bw2.c b/drivers/video/fbdev/bw2.c
index eaab51be74f83ac4975fbf9f46b0ae280562a50f..4a64940e0c001c327de84c973d8b5232cf611f3b 100644 (file)
--- a/drivers/video/fbdev/bw2.c
+++ b/drivers/video/fbdev/bw2.c
@@ -372,7 +372,7 @@ static struct platform_driver bw2_driver = {
                .of_match_table = bw2_match,
        },
        .probe          = bw2_probe,
-       .remove_new     = bw2_remove,
+       .remove         = bw2_remove,
 };
 
 static int __init bw2_init(void)

diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c
index c161b2af8933081b3dbbc2c5fc3e48a552015c2f..430e1a7b352b27d08dd357a862e6259d98f4f9aa 100644 (file)
--- a/drivers/video/fbdev/cg14.c
+++ b/drivers/video/fbdev/cg14.c
@@ -590,7 +590,7 @@ static struct platform_driver cg14_driver = {
                .of_match_table = cg14_match,
        },
        .probe          = cg14_probe,
-       .remove_new     = cg14_remove,
+       .remove         = cg14_remove,
 };
 
 static int __init cg14_init(void)

diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c
index 5e1f1b9a81b636e2b4666e1b7cb05f3b2bf94a96..e4c53c6632ba07aed166b22c2a1e6f66ad6da7fb 100644 (file)
--- a/drivers/video/fbdev/cg3.c
+++ b/drivers/video/fbdev/cg3.c
@@ -458,7 +458,7 @@ static struct platform_driver cg3_driver = {
                .of_match_table = cg3_match,
        },
        .probe          = cg3_probe,
-       .remove_new     = cg3_remove,
+       .remove         = cg3_remove,
 };
 
 static int __init cg3_init(void)

diff --git a/drivers/video/fbdev/cg6.c b/drivers/video/fbdev/cg6.c
index 69d3ce50948de341ff1828a7ea981cf34562fa2e..0b60df51e7bc033a63c7a82446780cb0494bd1e2 100644 (file)
--- a/drivers/video/fbdev/cg6.c
+++ b/drivers/video/fbdev/cg6.c
@@ -858,7 +858,7 @@ static struct platform_driver cg6_driver = {
                .of_match_table = cg6_match,
        },
        .probe          = cg6_probe,
-       .remove_new     = cg6_remove,
+       .remove         = cg6_remove,
 };
 
 static int __init cg6_init(void)

diff --git a/drivers/video/fbdev/clps711x-fb.c b/drivers/video/fbdev/clps711x-fb.c
index 6171a98a48fd5f3a5da01e28b51ee97d2657c2ea..0d0ba617b4aa87b711440f86b5ac56a65799e5c5 100644 (file)
--- a/drivers/video/fbdev/clps711x-fb.c
+++ b/drivers/video/fbdev/clps711x-fb.c
@@ -371,7 +371,7 @@ static struct platform_driver clps711x_fb_driver = {
                .of_match_table = clps711x_fb_dt_ids,
        },
        .probe  = clps711x_fb_probe,
-       .remove_new = clps711x_fb_remove,
+       .remove = clps711x_fb_remove,
 };
 module_platform_driver(clps711x_fb_driver);
 

diff --git a/drivers/video/fbdev/cobalt_lcdfb.c b/drivers/video/fbdev/cobalt_lcdfb.c
index c2b8f894799ca01fe1048a5a68fff69e67c4d708..308967b5096ad1ae409564484555e9b4fb589159 100644 (file)
--- a/drivers/video/fbdev/cobalt_lcdfb.c
+++ b/drivers/video/fbdev/cobalt_lcdfb.c
@@ -344,7 +344,7 @@ static void cobalt_lcdfb_remove(struct platform_device *dev)
 
 static struct platform_driver cobalt_lcdfb_driver = {
        .probe  = cobalt_lcdfb_probe,
-       .remove_new = cobalt_lcdfb_remove,
+       .remove = cobalt_lcdfb_remove,
        .driver = {
                .name   = "cobalt-lcd",
        },

diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 4ca70a1bdd3b288c225e1621596d66fc18b21de9..fad1e13c63323f0b4dd739e882a900442cdf4e8b 100644 (file)
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -1652,7 +1652,7 @@ static SIMPLE_DEV_PM_OPS(fb_pm_ops, fb_suspend, fb_resume);
 
 static struct platform_driver da8xx_fb_driver = {
        .probe = fb_probe,
-       .remove_new = fb_remove,
+       .remove = fb_remove,
        .driver = {
                   .name = DRIVER_NAME,
                   .pm  = &fb_pm_ops,

diff --git a/drivers/video/fbdev/ep93xx-fb.c b/drivers/video/fbdev/ep93xx-fb.c
index 3e378874ccc79ea673d340c8a183cddbd227cb78..801ef427f1baf1bf3b3762c94da14112b062a111 100644 (file)
--- a/drivers/video/fbdev/ep93xx-fb.c
+++ b/drivers/video/fbdev/ep93xx-fb.c
@@ -592,7 +592,7 @@ static void ep93xxfb_remove(struct platform_device *pdev)
 
 static struct platform_driver ep93xxfb_driver = {
        .probe          = ep93xxfb_probe,
-       .remove_new     = ep93xxfb_remove,
+       .remove         = ep93xxfb_remove,
        .driver = {
                .name   = "ep93xx-fb",
        },

diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c
index 2a0f5337e091ef036ab39d317e57ab5831a7b636..0b7e7b38c05ad10eb074a008d5e2d7e30481d8ce 100644 (file)
--- a/drivers/video/fbdev/ffb.c
+++ b/drivers/video/fbdev/ffb.c
@@ -1053,7 +1053,7 @@ static struct platform_driver ffb_driver = {
                .of_match_table = ffb_match,
        },
        .probe          = ffb_probe,
-       .remove_new     = ffb_remove,
+       .remove         = ffb_remove,
 };
 
 static int __init ffb_init(void)

diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
index ea37a60da10c42c88770482e99a9566ee90e4b0b..5ac8201c353378fbef760b513013c4b88e562a7b 100644 (file)
--- a/drivers/video/fbdev/fsl-diu-fb.c
+++ b/drivers/video/fbdev/fsl-diu-fb.c
@@ -1876,12 +1876,12 @@ static const struct of_device_id fsl_diu_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_diu_match);
 
 static struct platform_driver fsl_diu_driver = {
-       .driver = {
+       .driver         = {
                .name = "fsl-diu-fb",
                .of_match_table = fsl_diu_match,
        },
-       .probe          = fsl_diu_probe,
-       .remove_new     = fsl_diu_remove,
+       .probe          = fsl_diu_probe,
+       .remove         = fsl_diu_remove,
        .suspend        = fsl_diu_suspend,
        .resume         = fsl_diu_resume,
 };

diff --git a/drivers/video/fbdev/gbefb.c b/drivers/video/fbdev/gbefb.c
index 8463de833d1e19efb27b2c4d2b6d1952e139fb71..4c36a3e409bea9c6b4b99316759f4ba7a84eb338 100644 (file)
--- a/drivers/video/fbdev/gbefb.c
+++ b/drivers/video/fbdev/gbefb.c
@@ -1247,10 +1247,10 @@ static void gbefb_remove(struct platform_device* p_dev)
 
 static struct platform_driver gbefb_driver = {
        .probe = gbefb_probe,
-       .remove_new = gbefb_remove,
-       .driver = {
+       .remove = gbefb_remove,
+       .driver = {
                .name = "gbefb",
-               .dev_groups     = gbefb_groups,
+               .dev_groups = gbefb_groups,
        },
 };
 

diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c
index 5f8de1ec23c3c89fc1f1775ef5bf24071e957e07..7704f2ab18c03cc2f8accfeceffd5ff7a377dcfe 100644 (file)
--- a/drivers/video/fbdev/goldfishfb.c
+++ b/drivers/video/fbdev/goldfishfb.c
@@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(acpi, goldfish_fb_acpi_match);
 
 static struct platform_driver goldfish_fb_driver = {
        .probe          = goldfish_fb_probe,
-       .remove_new     = goldfish_fb_remove,
+       .remove         = goldfish_fb_remove,
        .driver = {
                .name = "goldfish_fb",
                .of_match_table = goldfish_fb_of_match,

diff --git a/drivers/video/fbdev/grvga.c b/drivers/video/fbdev/grvga.c
index 6d917e06e5f3b36b25fe60d7203fce6f256f268d..de8ab817d406568c93248c63ecce3ced694b41dd 100644 (file)
--- a/drivers/video/fbdev/grvga.c
+++ b/drivers/video/fbdev/grvga.c
@@ -540,7 +540,7 @@ static struct platform_driver grvga_driver = {
                .of_match_table = svgactrl_of_match,
        },
        .probe          = grvga_probe,
-       .remove_new     = grvga_remove,
+       .remove         = grvga_remove,
 };
 
 module_platform_driver(grvga_driver);

diff --git a/drivers/video/fbdev/hecubafb.c b/drivers/video/fbdev/hecubafb.c
index ef526ed4a2d9ca39aa893b8403666b9e43bdb302..3547d58a29cf2f848c1c0197e890279cf0c5cdfd 100644 (file)
--- a/drivers/video/fbdev/hecubafb.c
+++ b/drivers/video/fbdev/hecubafb.c
@@ -235,7 +235,7 @@ static void hecubafb_remove(struct platform_device *dev)
 
 static struct platform_driver hecubafb_driver = {
        .probe  = hecubafb_probe,
-       .remove_new = hecubafb_remove,
+       .remove = hecubafb_remove,
        .driver = {
                .name   = "hecubafb",
        },

diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c
index c3bc5b78b749a295883dfcdea3c923ebef11fff4..14418aa3791aa3b223361e729112b9b9d22bf45c 100644 (file)
--- a/drivers/video/fbdev/hgafb.c
+++ b/drivers/video/fbdev/hgafb.c
@@ -629,7 +629,7 @@ static void hgafb_remove(struct platform_device *pdev)
 
 static struct platform_driver hgafb_driver = {
        .probe = hgafb_probe,
-       .remove_new = hgafb_remove,
+       .remove = hgafb_remove,
        .driver = {
                .name = "hgafb",
        },

diff --git a/drivers/video/fbdev/hitfb.c b/drivers/video/fbdev/hitfb.c
index b64b74b76c71f955e9489544dfaa0b735e3389e7..97db325df2b4564a0542499357be499c8bc2e1d7 100644 (file)
--- a/drivers/video/fbdev/hitfb.c
+++ b/drivers/video/fbdev/hitfb.c
@@ -476,7 +476,7 @@ static const struct dev_pm_ops hitfb_dev_pm_ops = {
 
 static struct platform_driver hitfb_driver = {
        .probe          = hitfb_probe,
-       .remove_new     = hitfb_remove,
+       .remove         = hitfb_remove,
        .driver         = {
                .name   = "hitfb",
                .pm     = &hitfb_dev_pm_ops,

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index 4ebfe9b9df60a4b87614571b56f28daede5669ba..ff343e4ed35ba5c120cbaf487c46d85cdf68cfc4 100644 (file)
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -1105,7 +1105,7 @@ static struct platform_driver imxfb_driver = {
                .pm     = pm_sleep_ptr(&imxfb_pm_ops),
        },
        .probe          = imxfb_probe,
-       .remove_new     = imxfb_remove,
+       .remove         = imxfb_remove,
        .id_table       = imxfb_devtype,
 };
 module_platform_driver(imxfb_driver);

diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c
index 7cf525c76079b63b12c9eba0e8604448b81caf2b..271e2e8c6a846143f5a2bef7456c3736746ec76e 100644 (file)
--- a/drivers/video/fbdev/leo.c
+++ b/drivers/video/fbdev/leo.c
@@ -657,7 +657,7 @@ static struct platform_driver leo_driver = {
                .of_match_table = leo_match,
        },
        .probe          = leo_probe,
-       .remove_new     = leo_remove,
+       .remove         = leo_remove,
 };
 
 static int __init leo_init(void)

diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
index baec312d7b33bc9f03a7aa8c5155358e3a791331..ade88e7bc7607f78bb9972b0286b73119c00682f 100644 (file)
--- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
@@ -834,7 +834,7 @@ static struct platform_driver of_platform_mb862xxfb_driver = {
                .of_match_table = of_platform_mb862xx_tbl,
        },
        .probe          = of_platform_mb862xx_probe,
-       .remove_new     = of_platform_mb862xx_remove,
+       .remove         = of_platform_mb862xx_remove,
 };
 #endif
 

diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c
index c15353a356b68a5817ef99a457a5baaf1235d465..6f0942c6e5f1c68d97b6d6db598bda839a8cae04 100644 (file)
--- a/drivers/video/fbdev/metronomefb.c
+++ b/drivers/video/fbdev/metronomefb.c
@@ -707,7 +707,7 @@ static void metronomefb_remove(struct platform_device *dev)
 
 static struct platform_driver metronomefb_driver = {
        .probe  = metronomefb_probe,
-       .remove_new = metronomefb_remove,
+       .remove = metronomefb_remove,
        .driver = {
                .name   = "metronomefb",
        },

diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index 7dc305c67af80522c7932cb72a9d61098933c7fa..893888260c21c406ea7668c2d629e6a80aa34a51 100644 (file)
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c
@@ -391,7 +391,7 @@ MODULE_DEVICE_TABLE(of, ocfb_match);
 
 static struct platform_driver ocfb_driver = {
        .probe  = ocfb_probe,
-       .remove_new = ocfb_remove,
+       .remove = ocfb_remove,
        .driver = {
                .name = "ocfb_fb",
                .of_match_table = ocfb_match,

diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
index e8ff33894603cefebc2c5191324a1065db272a91..f85428e13996baf473c14fc4114a7cb90a45d6c9 100644 (file)
--- a/drivers/video/fbdev/offb.c
+++ b/drivers/video/fbdev/offb.c
@@ -673,7 +673,7 @@ static struct platform_driver offb_driver_bootx_noscreen = {
                .name = "bootx-noscreen",
        },
        .probe = offb_probe_bootx_noscreen,
-       .remove_new = offb_remove,
+       .remove = offb_remove,
 };
 
 static int offb_probe_display(struct platform_device *pdev)
@@ -695,7 +695,7 @@ static struct platform_driver offb_driver_display = {
                .of_match_table = offb_of_match_display,
        },
        .probe = offb_probe_display,
-       .remove_new = offb_remove,
+       .remove = offb_remove,
 };
 
 static int __init offb_init(void)

diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index e12c6019a4d64237758ce25349cc14d93f1c5cc0..2682b20d184a096d3783130975ef0bf6f6802417 100644 (file)
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1825,7 +1825,7 @@ static int omapfb_resume(struct platform_device *pdev)
 
 static struct platform_driver omapfb_driver = {
        .probe          = omapfb_probe,
-       .remove_new     = omapfb_remove,
+       .remove         = omapfb_remove,
        .suspend        = omapfb_suspend,
        .resume         = omapfb_resume,
        .driver         = {

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index c6786726a1af1da9cd50b940c9f0502a0512b317..cef1603b753084b92b43f162952080cbcd91fc95 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, tvc_of_match);
 
 static struct platform_driver tvc_connector_driver = {
        .probe  = tvc_probe,
-       .remove_new = tvc_remove,
+       .remove = tvc_remove,
        .driver = {
                .name   = "connector-analog-tv",
                .of_match_table = tvc_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
index 0cc9294f89b497eb963888a831fa91044e300fad..3f129ce9ff01a44776878465e2054c2671de25af 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c
@@ -328,7 +328,7 @@ MODULE_DEVICE_TABLE(of, dvic_of_match);
 
 static struct platform_driver dvi_connector_driver = {
        .probe  = dvic_probe,
-       .remove_new = dvic_remove,
+       .remove = dvic_remove,
        .driver = {
                .name   = "connector-dvi",
                .of_match_table = dvic_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index b862a32670aeff30c79214bf21ad5d0a58ce1419..e3df731172e83004b6734faa8befd0c5b0052b30 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -272,7 +272,7 @@ MODULE_DEVICE_TABLE(of, hdmic_of_match);
 
 static struct platform_driver hdmi_connector_driver = {
        .probe  = hdmic_probe,
-       .remove_new = hdmic_remove,
+       .remove = hdmic_remove,
        .driver = {
                .name   = "connector-hdmi",
                .of_match_table = hdmic_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
index f0d3eb581166bd3a66a5f4fcb8053a9c9abf9752..f4e7ed943b8a4256e72f95c5a20b94d48f25d1a9 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c
@@ -258,7 +258,7 @@ MODULE_DEVICE_TABLE(of, opa362_of_match);
 
 static struct platform_driver opa362_driver = {
        .probe  = opa362_probe,
-       .remove_new = opa362_remove,
+       .remove = opa362_remove,
        .driver = {
                .name   = "amplifier-opa362",
                .of_match_table = opa362_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
index c8aca4592949cb3b1ea61a1cf40fc6debd3ec32a..458e65771cbb76b1b64b353c5e4b686dc1b0a6f0 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c
@@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, tfp410_of_match);
 
 static struct platform_driver tfp410_driver = {
        .probe  = tfp410_probe,
-       .remove_new = tfp410_remove,
+       .remove = tfp410_remove,
        .driver = {
                .name   = "tfp410",
                .of_match_table = tfp410_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
index eb3926d0361b9e928365739fe2e3adda8c423b3d..8cf0cb922f3c003fe473b897d8026aec239bb481 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(of, tpd_of_match);
 
 static struct platform_driver tpd_driver = {
        .probe  = tpd_probe,
-       .remove_new = tpd_remove,
+       .remove = tpd_remove,
        .driver = {
                .name   = "tpd12s015",
                .of_match_table = tpd_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
index 937f9091274f03d3e9855a77ca228c4527fa0b01..22f4262b2432421cf7680c9b7311e69f77ba86b7 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
@@ -234,7 +234,7 @@ MODULE_DEVICE_TABLE(of, panel_dpi_of_match);
 
 static struct platform_driver panel_dpi_driver = {
        .probe = panel_dpi_probe,
-       .remove_new = panel_dpi_remove,
+       .remove = panel_dpi_remove,
        .driver = {
                .name = "panel-dpi",
                .of_match_table = panel_dpi_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
index 274bdf7b3b459fbcd4e34af51dbaf937d2b0e7cf..4a0df640ab6484c787070f503402dbb5798214d6 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@@ -1275,7 +1275,7 @@ MODULE_DEVICE_TABLE(of, dsicm_of_match);
 
 static struct platform_driver dsicm_driver = {
        .probe = dsicm_probe,
-       .remove_new = dsicm_remove,
+       .remove = dsicm_remove,
        .driver = {
                .name = "panel-dsi-cm",
                .of_match_table = dsicm_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
index e37268cf8dcaec4536e11369343966beb5538aa7..888d94ea8e7db8a20c7e31c6f24752be0b2d5c80 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c
@@ -315,7 +315,7 @@ MODULE_DEVICE_TABLE(of, sharp_ls_of_match);
 
 static struct platform_driver sharp_ls_driver = {
        .probe = sharp_ls_probe,
-       .remove_new = sharp_ls_remove,
+       .remove = sharp_ls_remove,
        .driver = {
                .name = "panel-sharp-ls037v7dw01",
                .of_match_table = sharp_ls_of_match,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index 5fbd8885bad8a75a1d9cfefacca0259bbe827e0f..55b640f2f24564a8d89af3582ac136c8edf5a828 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -185,10 +185,10 @@ static void omap_dss_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver omap_dss_driver = {
-       .remove_new     = omap_dss_remove,
+       .remove         = omap_dss_remove,
        .shutdown       = omap_dss_shutdown,
-       .driver         = {
-               .name   = "omapdss",
+       .driver         = {
+               .name   = "omapdss",
        },
 };
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index 21fef9db90d26a371906ad78fd00c37d8de31156..5832485ab998c48e698e403c6be73c7d74aa14f3 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -4072,7 +4072,7 @@ static const struct of_device_id dispc_of_match[] = {
 
 static struct platform_driver omap_dispchw_driver = {
        .probe          = dispc_probe,
-       .remove_new     = dispc_remove,
+       .remove         = dispc_remove,
        .driver         = {
                .name   = "omapdss_dispc",
                .pm     = &dispc_pm_ops,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
index 7c1b7d89389aa4f6928cdb7e0a05479ec0a236c6..c40b87ffe8fcbfa2a687597eb18cd1e79b775e93 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dpi.c
@@ -817,8 +817,8 @@ static void dpi_remove(struct platform_device *pdev)
 
 static struct platform_driver omap_dpi_driver = {
        .probe          = dpi_probe,
-       .remove_new     = dpi_remove,
-       .driver         = {
+       .remove         = dpi_remove,
+       .driver         = {
                .name   = "omapdss_dpi",
                .suppress_bind_attrs = true,
        },

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 1f13bcf73da54fe1eb38724be8e27065f98b5bb8..1f3434c040c14a0325f17fa24840c3be757d74ae 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -5565,7 +5565,7 @@ static const struct of_device_id dsi_of_match[] = {
 
 static struct platform_driver omap_dsihw_driver = {
        .probe          = dsi_probe,
-       .remove_new     = dsi_remove,
+       .remove         = dsi_remove,
        .driver         = {
                .name   = "omapdss_dsi",
                .pm     = &dsi_pm_ops,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
index d814e4baa4b33a66ad36a866a48f96da1b139287..f06debee02c5c57b29ed0aa6fb8eee7cf00e88cb 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@@ -1278,7 +1278,7 @@ MODULE_DEVICE_TABLE(of, dss_of_match);
 
 static struct platform_driver omap_dsshw_driver = {
        .probe          = dss_probe,
-       .remove_new     = dss_remove,
+       .remove         = dss_remove,
        .driver         = {
                .name   = "omapdss_dss",
                .pm     = &dss_pm_ops,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index 8f407ec134dc3302d643b747c21883654ee497fa..428001fd4ac9d4fc731dff068fbeb77f7e8a6e7b 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -792,9 +792,9 @@ static const struct of_device_id hdmi_of_match[] = {
 
 static struct platform_driver omapdss_hdmihw_driver = {
        .probe          = hdmi4_probe,
-       .remove_new     = hdmi4_remove,
-       .driver         = {
-               .name   = "omapdss_hdmi",
+       .remove         = hdmi4_remove,
+       .driver         = {
+               .name   = "omapdss_hdmi",
                .pm     = &hdmi_pm_ops,
                .of_match_table = hdmi_of_match,
                .suppress_bind_attrs = true,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
index 4ad219f522b90befee7ec311851441f9a79feb18..aa052805050e467cb11a381cd943f10d02499be4 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -834,7 +834,7 @@ static const struct of_device_id hdmi_of_match[] = {
 
 static struct platform_driver omapdss_hdmihw_driver = {
        .probe          = hdmi5_probe,
-       .remove_new     = hdmi5_remove,
+       .remove         = hdmi5_remove,
        .driver         = {
                .name   = "omapdss_hdmi5",
                .pm     = &hdmi_pm_ops,

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/sdi.c b/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
index d527931b2b165421f82fda7d16f9db7160ffe74c..2a45f019ef4574a946b2c5568dea55aacd0d9d0b 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/sdi.c
@@ -382,9 +382,9 @@ static void sdi_remove(struct platform_device *pdev)
 
 static struct platform_driver omap_sdi_driver = {
        .probe          = sdi_probe,
-       .remove_new     = sdi_remove,
-       .driver         = {
-               .name   = "omapdss_sdi",
+       .remove         = sdi_remove,
+       .driver         = {
+               .name   = "omapdss_sdi",
                .suppress_bind_attrs = true,
        },
 };

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index d13ad00d353bb5e8de048ae21fba6fbaf1d3e4fb..f99dda9e55a5abe0a7a45d3871418d5372bdd99a 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -920,9 +920,9 @@ static const struct of_device_id venc_of_match[] = {
 
 static struct platform_driver omap_venchw_driver = {
        .probe          = venc_probe,
-       .remove_new     = venc_remove,
-       .driver         = {
-               .name   = "omapdss_venc",
+       .remove         = venc_remove,
+       .driver         = {
+               .name   = "omapdss_venc",
                .pm     = &venc_pm_ops,
                .of_match_table = venc_of_match,
                .suppress_bind_attrs = true,

diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 0db9c55fce5a281b21aeadb386a77be469638908..211f23648686ced67eaa7ee5e00322936e254ba1 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -2614,7 +2614,7 @@ static void omapfb_remove(struct platform_device *pdev)
 
 static struct platform_driver omapfb_driver = {
        .probe          = omapfb_probe,
-       .remove_new     = omapfb_remove,
+       .remove         = omapfb_remove,
        .driver         = {
                .name   = "omapfb",
        },

diff --git a/drivers/video/fbdev/p9100.c b/drivers/video/fbdev/p9100.c
index e1356f8a866ea25cb9ff545fe135c3cce196fb80..124468f0e9efb9919a18957ccff47dcd6eb81fba 100644 (file)
--- a/drivers/video/fbdev/p9100.c
+++ b/drivers/video/fbdev/p9100.c
@@ -347,7 +347,7 @@ static struct platform_driver p9100_driver = {
                .of_match_table = p9100_match,
        },
        .probe          = p9100_probe,
-       .remove_new     = p9100_remove,
+       .remove         = p9100_remove,
 };
 
 static int __init p9100_init(void)

diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c
index cb6fcc64c8e20c37132f2d4babed4095ffef626d..a08d955d9b439426e457394031661d6d319f5554 100644 (file)
--- a/drivers/video/fbdev/platinumfb.c
+++ b/drivers/video/fbdev/platinumfb.c
@@ -668,7 +668,7 @@ static struct platform_driver platinum_driver =
                .of_match_table = platinumfb_match,
        },
        .probe          = platinumfb_probe,
-       .remove_new     = platinumfb_remove,
+       .remove         = platinumfb_remove,
 };
 
 static int __init platinumfb_init(void)

diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
index adee34386580061f39e9a6306146b3ce62250c2a..ec602f7776eb03105d8ce0cc1b582d40ca6dab40 100644 (file)
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
@@ -799,7 +799,7 @@ static struct platform_driver pxa168fb_driver = {
                .name   = "pxa168-fb",
        },
        .probe          = pxa168fb_probe,
-       .remove_new     = pxa168fb_remove,
+       .remove         = pxa168fb_remove,
 };
 
 module_platform_driver(pxa168fb_driver);

diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
index 489088b4e467baba1dc2a2d644efe7c824d1ce0c..4a78b387b34356a1bfa0a5be80adeebe32d783f8 100644 (file)
--- a/drivers/video/fbdev/pxa3xx-gcu.c
+++ b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -696,10 +696,10 @@ MODULE_DEVICE_TABLE(of, pxa3xx_gcu_of_match);
 #endif
 
 static struct platform_driver pxa3xx_gcu_driver = {
-       .probe    = pxa3xx_gcu_probe,
-       .remove_new      = pxa3xx_gcu_remove,
-       .driver  = {
-               .name   = DRV_NAME,
+       .probe = pxa3xx_gcu_probe,
+       .remove = pxa3xx_gcu_remove,
+       .driver = {
+               .name = DRV_NAME,
                .of_match_table = of_match_ptr(pxa3xx_gcu_of_match),
        },
 };

diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index 5ce02495cda6380b30f67d202f131d105133cf4c..4aa84853e31a842b35d5a89e7285b0a43fe5321d 100644 (file)
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -2427,7 +2427,7 @@ MODULE_DEVICE_TABLE(of, pxafb_of_dev_id);
 
 static struct platform_driver pxafb_driver = {
        .probe          = pxafb_probe,
-       .remove_new     = pxafb_remove,
+       .remove         = pxafb_remove,
        .driver         = {
                .name   = "pxa2xx-fb",
                .of_match_table = pxafb_of_dev_id,

diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
index 0e871197c6de681593f910785f03d419a4404d0c..e80c806ef520dc4beba2c5091a446c3c4c947a22 100644 (file)
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@ -1001,7 +1001,7 @@ static int s1d13xxxfb_resume(struct platform_device *dev)
 
 static struct platform_driver s1d13xxxfb_driver = {
        .probe          = s1d13xxxfb_probe,
-       .remove_new     = s1d13xxxfb_remove,
+       .remove         = s1d13xxxfb_remove,
 #ifdef CONFIG_PM
        .suspend        = s1d13xxxfb_suspend,
        .resume         = s1d13xxxfb_resume,

diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index 2b85aad6a3045130cacad76feaeb3d3e7e622afd..2f4d707e2e097f52bc7a8008ba33796b07b85735 100644 (file)
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -1789,7 +1789,7 @@ static const struct dev_pm_ops s3cfb_pm_ops = {
 
 static struct platform_driver s3c_fb_driver = {
        .probe          = s3c_fb_probe,
-       .remove_new     = s3c_fb_remove,
+       .remove         = s3c_fb_remove,
        .id_table       = s3c_fb_driver_ids,
        .driver         = {
                .name   = "s3c-fb",

diff --git a/drivers/video/fbdev/sh7760fb.c b/drivers/video/fbdev/sh7760fb.c
index 08a4943dc54184144ff231211ac3887fb9aa2f99..3d2a27fefc874a766b27c0ab9984bb2676d5abb5 100644 (file)
--- a/drivers/video/fbdev/sh7760fb.c
+++ b/drivers/video/fbdev/sh7760fb.c
@@ -575,7 +575,7 @@ static struct platform_driver sh7760_lcdc_driver = {
                   .name = "sh7760-lcdc",
                   },
        .probe = sh7760fb_probe,
-       .remove_new = sh7760fb_remove,
+       .remove = sh7760fb_remove,
 };
 
 module_platform_driver(sh7760_lcdc_driver);

diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index 73c69e39a68de7728a380c89dbc61d062e816567..6b37b188af3149112c6f6dd33cab8042b49a7ce1 100644 (file)
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -2648,7 +2648,7 @@ static struct platform_driver sh_mobile_lcdc_driver = {
                .pm             = &sh_mobile_lcdc_dev_pm_ops,
        },
        .probe          = sh_mobile_lcdc_probe,
-       .remove_new     = sh_mobile_lcdc_remove,
+       .remove         = sh_mobile_lcdc_remove,
 };
 
 module_platform_driver(sh_mobile_lcdc_driver);

diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c
index 028a565250476c5f58434b68a6ea5152e4ccd606..be95fcddce4c8ca794826b805cd7dad2985bd637 100644 (file)
--- a/drivers/video/fbdev/simplefb.c
+++ b/drivers/video/fbdev/simplefb.c
@@ -677,7 +677,7 @@ static struct platform_driver simplefb_driver = {
                .of_match_table = simplefb_of_match,
        },
        .probe = simplefb_probe,
-       .remove_new = simplefb_remove,
+       .remove = simplefb_remove,
 };
 
 module_platform_driver(simplefb_driver);

diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index d6fdc1737cd2441f0537d2ab1436852b370ef601..86ecbb2d86db8d99a1d2c3b8f23e157a52992db5 100644 (file)
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -2211,7 +2211,7 @@ static int sm501fb_resume(struct platform_device *pdev)
 
 static struct platform_driver sm501fb_driver = {
        .probe          = sm501fb_probe,
-       .remove_new     = sm501fb_remove,
+       .remove         = sm501fb_remove,
        .suspend        = sm501fb_suspend,
        .resume         = sm501fb_resume,
        .driver         = {

diff --git a/drivers/video/fbdev/tcx.c b/drivers/video/fbdev/tcx.c
index fe7b7bc77eda39db4436c54f255c4d6b053c6a91..6eb8bb2e3501353c78f76ab59b8eb3ad5804996a 100644 (file)
--- a/drivers/video/fbdev/tcx.c
+++ b/drivers/video/fbdev/tcx.c
@@ -505,7 +505,7 @@ static struct platform_driver tcx_driver = {
                .of_match_table = tcx_match,
        },
        .probe          = tcx_probe,
-       .remove_new     = tcx_remove,
+       .remove         = tcx_remove,
 };
 
 static int __init tcx_init(void)

diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index 2a88f0d4a84c5c4cfc6f5d3959afb96f4e63d083..5d52fd00806e9f88ef045eef102a8307819c0d4d 100644 (file)
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1794,7 +1794,7 @@ static void uvesafb_remove(struct platform_device *dev)
 
 static struct platform_driver uvesafb_driver = {
        .probe  = uvesafb_probe,
-       .remove_new = uvesafb_remove,
+       .remove = uvesafb_remove,
        .driver = {
                .name = "uvesafb",
        },

diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
index 5a161750a3aeeff51b8a2ee1fa43b231c347dfc1..a81df88651433aa082f8a0c0a02c84ec93c3a683 100644 (file)
--- a/drivers/video/fbdev/vesafb.c
+++ b/drivers/video/fbdev/vesafb.c
@@ -515,7 +515,7 @@ static struct platform_driver vesafb_driver = {
                .name = "vesa-framebuffer",
        },
        .probe = vesafb_probe,
-       .remove_new = vesafb_remove,
+       .remove = vesafb_remove,
 };
 
 module_platform_driver(vesafb_driver);

diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index 158e48385c243b5d8577a90fb98c67fbdf0c0bb8..5b7965f36c5eda0123410422cd5bebecc6dad78d 100644 (file)
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -493,7 +493,7 @@ static void vfb_remove(struct platform_device *dev)
 
 static struct platform_driver vfb_driver = {
        .probe  = vfb_probe,
-       .remove_new = vfb_remove,
+       .remove = vfb_remove,
        .driver = {
                .name   = "vfb",
        },

diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c
index a87bafbb119cc1dc6b60732d14ef6260fe8ca7c5..fce0f5db7ba3e5d57c3acf662c2295632859f3b7 100644 (file)
--- a/drivers/video/fbdev/vga16fb.c
+++ b/drivers/video/fbdev/vga16fb.c
@@ -1417,7 +1417,7 @@ MODULE_DEVICE_TABLE(platform, vga16fb_driver_id_table);
 
 static struct platform_driver vga16fb_driver = {
        .probe = vga16fb_probe,
-       .remove_new = vga16fb_remove,
+       .remove = vga16fb_remove,
        .driver = {
                .name = "vga16fb",
        },

diff --git a/drivers/video/fbdev/via/via-gpio.c b/drivers/video/fbdev/via/via-gpio.c
index 2719943c06f4268519fae2b572e670d3e12e6c5d..9577c2cd52c76c15fd6c13495e13646f69db6e21 100644 (file)
--- a/drivers/video/fbdev/via/via-gpio.c
+++ b/drivers/video/fbdev/via/via-gpio.c
@@ -292,7 +292,7 @@ static struct platform_driver via_gpio_driver = {
                .name = "viafb-gpio",
        },
        .probe = viafb_gpio_probe,
-       .remove_new = viafb_gpio_remove,
+       .remove = viafb_gpio_remove,
 };
 
 int viafb_gpio_init(void)

diff --git a/drivers/video/fbdev/via/via_i2c.c b/drivers/video/fbdev/via/via_i2c.c
index 5edd3827ca271a441c277d3977b61cdfc271289d..cdbd7a9b88173f9838d6cb289cd99010c8ee56e8 100644 (file)
--- a/drivers/video/fbdev/via/via_i2c.c
+++ b/drivers/video/fbdev/via/via_i2c.c
@@ -265,7 +265,7 @@ static struct platform_driver via_i2c_driver = {
                .name = "viafb-i2c",
        },
        .probe = viafb_i2c_probe,
-       .remove_new = viafb_i2c_remove,
+       .remove = viafb_i2c_remove,
 };
 
 int viafb_i2c_init(void)

diff --git a/drivers/video/fbdev/vt8500lcdfb.c b/drivers/video/fbdev/vt8500lcdfb.c
index ac73937073a76f7d22df39a503ac59bda2d4a7da..b08a6fdc53fd2f1b89a0524e7e97de9878031966 100644 (file)
--- a/drivers/video/fbdev/vt8500lcdfb.c
+++ b/drivers/video/fbdev/vt8500lcdfb.c
@@ -471,7 +471,7 @@ static const struct of_device_id via_dt_ids[] = {
 
 static struct platform_driver vt8500lcd_driver = {
        .probe          = vt8500lcd_probe,
-       .remove_new     = vt8500lcd_remove,
+       .remove         = vt8500lcd_remove,
        .driver         = {
                .name   = "vt8500-lcd",
                .of_match_table = of_match_ptr(via_dt_ids),

diff --git a/drivers/video/fbdev/wm8505fb.c b/drivers/video/fbdev/wm8505fb.c
index 00952e9c880287abf7fe17240e70aa15f9c20c6a..5caf74ca92fb3b21b78cc3c610ddd9dd39f00ad9 100644 (file)
--- a/drivers/video/fbdev/wm8505fb.c
+++ b/drivers/video/fbdev/wm8505fb.c
@@ -392,7 +392,7 @@ static const struct of_device_id wmt_dt_ids[] = {
 
 static struct platform_driver wm8505fb_driver = {
        .probe          = wm8505fb_probe,
-       .remove_new     = wm8505fb_remove,
+       .remove         = wm8505fb_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = wmt_dt_ids,

diff --git a/drivers/video/fbdev/wmt_ge_rops.c b/drivers/video/fbdev/wmt_ge_rops.c
index b70961901683f686f0d2760b37e657396e1a8fe5..69106299ab47cb75a4c1c5c923950ddabde836b0 100644 (file)
--- a/drivers/video/fbdev/wmt_ge_rops.c
+++ b/drivers/video/fbdev/wmt_ge_rops.c
@@ -159,7 +159,7 @@ static const struct of_device_id wmt_dt_ids[] = {
 
 static struct platform_driver wmt_ge_rops_driver = {
        .probe          = wmt_ge_rops_probe,
-       .remove_new     = wmt_ge_rops_remove,
+       .remove         = wmt_ge_rops_remove,
        .driver         = {
                .name   = "wmt_ge_rops",
                .of_match_table = wmt_dt_ids,

diff --git a/drivers/video/fbdev/xilinxfb.c b/drivers/video/fbdev/xilinxfb.c
index 33d20910cb41c4f82adf7c8ce3332ba60aba44db..0a6e05cd155a2cbdfff6d6c6900a2188446bb3bd 100644 (file)
--- a/drivers/video/fbdev/xilinxfb.c
+++ b/drivers/video/fbdev/xilinxfb.c
@@ -488,7 +488,7 @@ MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
 
 static struct platform_driver xilinxfb_of_driver = {
        .probe = xilinxfb_of_probe,
-       .remove_new = xilinxfb_of_remove,
+       .remove = xilinxfb_of_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = xilinxfb_of_match,