media: 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/media 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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/cec/platform/cec-gpio/cec-gpio.c b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
index 98dacb0919b673c058034fbc617edeb6b883263e..69351730ce861540057fd331c3a45d682a13f3e3 100644 (file)
--- a/drivers/media/cec/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/cec/platform/cec-gpio/cec-gpio.c
@@ -279,7 +279,7 @@ MODULE_DEVICE_TABLE(of, cec_gpio_match);
 
 static struct platform_driver cec_gpio_pdrv = {
        .probe  = cec_gpio_probe,
-       .remove_new = cec_gpio_remove,
+       .remove = cec_gpio_remove,
        .driver = {
                .name           = "cec-gpio",
                .of_match_table = cec_gpio_match,

diff --git a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
index 8fbbb4091455f15d62afbf4a196ca4cf58d9e286..12b73ea0f31d4774e6d84930e5447d4c9bd68b6a 100644 (file)
--- a/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
+++ b/drivers/media/cec/platform/cros-ec/cros-ec-cec.c
@@ -582,7 +582,7 @@ MODULE_DEVICE_TABLE(platform, cros_ec_cec_id);
 
 static struct platform_driver cros_ec_cec_driver = {
        .probe = cros_ec_cec_probe,
-       .remove_new = cros_ec_cec_remove,
+       .remove = cros_ec_cec_remove,
        .driver = {
                .name = DRV_NAME,
                .pm = &cros_ec_cec_pm_ops,

diff --git a/drivers/media/cec/platform/meson/ao-cec-g12a.c b/drivers/media/cec/platform/meson/ao-cec-g12a.c
index 51294b9b6cd5912abc80e46ad45450fe572f0e4f..41f5b8669cb01b4b9f77485615da764824d6c8fe 100644 (file)
--- a/drivers/media/cec/platform/meson/ao-cec-g12a.c
+++ b/drivers/media/cec/platform/meson/ao-cec-g12a.c
@@ -778,7 +778,7 @@ MODULE_DEVICE_TABLE(of, meson_ao_cec_g12a_of_match);
 
 static struct platform_driver meson_ao_cec_g12a_driver = {
        .probe   = meson_ao_cec_g12a_probe,
-       .remove_new = meson_ao_cec_g12a_remove,
+       .remove = meson_ao_cec_g12a_remove,
        .driver  = {
                .name = "meson-ao-cec-g12a",
                .of_match_table = of_match_ptr(meson_ao_cec_g12a_of_match),

diff --git a/drivers/media/cec/platform/meson/ao-cec.c b/drivers/media/cec/platform/meson/ao-cec.c
index 494738daf09a40ce3d53eb6c5973e5a2e6c2fef7..145efd9af6acaba66f048a6f9638c1b720e45e0c 100644 (file)
--- a/drivers/media/cec/platform/meson/ao-cec.c
+++ b/drivers/media/cec/platform/meson/ao-cec.c
@@ -714,7 +714,7 @@ MODULE_DEVICE_TABLE(of, meson_ao_cec_of_match);
 
 static struct platform_driver meson_ao_cec_driver = {
        .probe   = meson_ao_cec_probe,
-       .remove_new = meson_ao_cec_remove,
+       .remove = meson_ao_cec_remove,
        .driver  = {
                .name = "meson-ao-cec",
                .of_match_table = meson_ao_cec_of_match,

diff --git a/drivers/media/cec/platform/s5p/s5p_cec.c b/drivers/media/cec/platform/s5p/s5p_cec.c
index 51ab4a80aafe63a149b650fcfd4789abe1940196..4a92d3230f661e5f33137eaf81418d5fa529f812 100644 (file)
--- a/drivers/media/cec/platform/s5p/s5p_cec.c
+++ b/drivers/media/cec/platform/s5p/s5p_cec.c
@@ -294,7 +294,7 @@ MODULE_DEVICE_TABLE(of, s5p_cec_match);
 
 static struct platform_driver s5p_cec_pdrv = {
        .probe  = s5p_cec_probe,
-       .remove_new = s5p_cec_remove,
+       .remove = s5p_cec_remove,
        .driver = {
                .name           = CEC_NAME,
                .of_match_table = s5p_cec_match,

diff --git a/drivers/media/cec/platform/seco/seco-cec.c b/drivers/media/cec/platform/seco/seco-cec.c
index 5d4c5a2cae097e6b9edbc5d5fe7200221fbd54d6..b7bb49f023957716f9720f7e0bed6b4c37501681 100644 (file)
--- a/drivers/media/cec/platform/seco/seco-cec.c
+++ b/drivers/media/cec/platform/seco/seco-cec.c
@@ -778,7 +778,7 @@ static struct platform_driver secocec_driver = {
                   .pm = SECOCEC_PM_OPS,
        },
        .probe = secocec_probe,
-       .remove_new = secocec_remove,
+       .remove = secocec_remove,
 };
 
 module_platform_driver(secocec_driver);

diff --git a/drivers/media/cec/platform/sti/stih-cec.c b/drivers/media/cec/platform/sti/stih-cec.c
index 99978a7c8d9b70c73a0a82ec317909c071e592ad..49843d576c7ce7f1ac8215253d9bc8bddecf28ec 100644 (file)
--- a/drivers/media/cec/platform/sti/stih-cec.c
+++ b/drivers/media/cec/platform/sti/stih-cec.c
@@ -383,7 +383,7 @@ MODULE_DEVICE_TABLE(of, stih_cec_match);
 
 static struct platform_driver stih_cec_pdrv = {
        .probe  = stih_cec_probe,
-       .remove_new = stih_cec_remove,
+       .remove = stih_cec_remove,
        .driver = {
                .name           = CEC_NAME,
                .of_match_table = stih_cec_match,

diff --git a/drivers/media/cec/platform/stm32/stm32-cec.c b/drivers/media/cec/platform/stm32/stm32-cec.c
index bda9d254041a6aeb1d40856cc8f0a1ae8c759f9e..fea2d65acffc6e4178f328b7d24f6239031271eb 100644 (file)
--- a/drivers/media/cec/platform/stm32/stm32-cec.c
+++ b/drivers/media/cec/platform/stm32/stm32-cec.c
@@ -361,7 +361,7 @@ MODULE_DEVICE_TABLE(of, stm32_cec_of_match);
 
 static struct platform_driver stm32_cec_driver = {
        .probe  = stm32_cec_probe,
-       .remove_new = stm32_cec_remove,
+       .remove = stm32_cec_remove,
        .driver = {
                .name           = CEC_NAME,
                .of_match_table = stm32_cec_of_match,

diff --git a/drivers/media/cec/platform/tegra/tegra_cec.c b/drivers/media/cec/platform/tegra/tegra_cec.c
index 7c1022cee1e84f250f5123c47a1855035aa39b13..3ed50097262f64c32fe0480698cea9a1056a0953 100644 (file)
--- a/drivers/media/cec/platform/tegra/tegra_cec.c
+++ b/drivers/media/cec/platform/tegra/tegra_cec.c
@@ -465,7 +465,7 @@ static struct platform_driver tegra_cec_driver = {
                .of_match_table = tegra_cec_of_match,
        },
        .probe = tegra_cec_probe,
-       .remove_new = tegra_cec_remove,
+       .remove = tegra_cec_remove,
 
 #ifdef CONFIG_PM
        .suspend = tegra_cec_suspend,

diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index 023db6e793f867a9d2afdda849760a707dfc73c3..922c1662f1f038bebeb8abb3a7892e30ee1a0140 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -1487,7 +1487,7 @@ static struct platform_driver rtl2832_sdr_driver = {
                .name   = "rtl2832_sdr",
        },
        .probe          = rtl2832_sdr_probe,
-       .remove_new     = rtl2832_sdr_remove,
+       .remove         = rtl2832_sdr_remove,
 };
 module_platform_driver(rtl2832_sdr_driver);
 

diff --git a/drivers/media/dvb-frontends/zd1301_demod.c b/drivers/media/dvb-frontends/zd1301_demod.c
index 17f6e373c13d890b3e77758e45e23e613b79db39..e8b9e67a8717638a7a66bbc9ddc7395455d0a6ec 100644 (file)
--- a/drivers/media/dvb-frontends/zd1301_demod.c
+++ b/drivers/media/dvb-frontends/zd1301_demod.c
@@ -531,7 +531,7 @@ static struct platform_driver zd1301_demod_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = zd1301_demod_probe,
-       .remove_new     = zd1301_demod_remove,
+       .remove         = zd1301_demod_remove,
 };
 module_platform_driver(zd1301_demod_driver);
 

diff --git a/drivers/media/platform/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c
index 73606cee586ede0e26dcfe62d90379829c3d3cc9..76b4de1150b21d382feba40ffb1b6c18d1908a03 100644 (file)
--- a/drivers/media/platform/allegro-dvt/allegro-core.c
+++ b/drivers/media/platform/allegro-dvt/allegro-core.c
@@ -4003,7 +4003,7 @@ static const struct dev_pm_ops allegro_pm_ops = {
 
 static struct platform_driver allegro_driver = {
        .probe = allegro_probe,
-       .remove_new = allegro_remove,
+       .remove = allegro_remove,
        .driver = {
                .name = "allegro",
                .of_match_table = allegro_dt_ids,

diff --git a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
index 09409908ba5dfb45e3bc766e568a017304104852..b05c944d5dc2e50e8646d62a84c2971cce2f7cb5 100644 (file)
--- a/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
+++ b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c
@@ -1045,7 +1045,7 @@ MODULE_DEVICE_TABLE(of, meson_ge2d_match);
 
 static struct platform_driver ge2d_drv = {
        .probe = ge2d_probe,
-       .remove_new = ge2d_remove,
+       .remove = ge2d_remove,
        .driver = {
                .name = "meson-ge2d",
                .of_match_table = meson_ge2d_match,

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 3a2030d02e45e68644d4ce5159194e626cd65163..8df85c14ab3fb9b7f4ae5df6da2f86ec0a018628 100644 (file)
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -864,7 +864,7 @@ MODULE_DEVICE_TABLE(of, vpu_core_dt_match);
 
 static struct platform_driver amphion_vpu_core_driver = {
        .probe = vpu_core_probe,
-       .remove_new = vpu_core_remove,
+       .remove = vpu_core_remove,
        .driver = {
                .name = "amphion-vpu-core",
                .of_match_table = vpu_core_dt_match,

diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/amphion/vpu_drv.c
index 2bf70aafd2baab703bd3a0efa5b51e611e672c07..c6cbcaf433eeafcd12e0946d21f166834fa8dcb6 100644 (file)
--- a/drivers/media/platform/amphion/vpu_drv.c
+++ b/drivers/media/platform/amphion/vpu_drv.c
@@ -227,7 +227,7 @@ MODULE_DEVICE_TABLE(of, vpu_dt_match);
 
 static struct platform_driver amphion_vpu_driver = {
        .probe = vpu_probe,
-       .remove_new = vpu_remove,
+       .remove = vpu_remove,
        .driver = {
                .name = "amphion-vpu",
                .of_match_table = vpu_dt_match,

diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
index fc6050e3be0d8e7a9e9afae03413d34039106fa7..fd540349811517661671ac3c5a512af2127e0d44 100644 (file)
--- a/drivers/media/platform/aspeed/aspeed-video.c
+++ b/drivers/media/platform/aspeed/aspeed-video.c
@@ -2226,7 +2226,7 @@ static struct platform_driver aspeed_video_driver = {
                .of_match_table = aspeed_video_of_match,
        },
        .probe = aspeed_video_probe,
-       .remove_new = aspeed_video_remove,
+       .remove = aspeed_video_remove,
 };
 
 module_platform_driver(aspeed_video_driver);

diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c
index 5c823d3f9cc0c9927036c6cb82252bcf1104db06..049b7faf57900120dbea7ca213c29037e2c39360 100644 (file)
--- a/drivers/media/platform/atmel/atmel-isi.c
+++ b/drivers/media/platform/atmel/atmel-isi.c
@@ -1367,7 +1367,7 @@ static struct platform_driver atmel_isi_driver = {
                .pm     = &atmel_isi_dev_pm_ops,
        },
        .probe          = atmel_isi_probe,
-       .remove_new     = atmel_isi_remove,
+       .remove         = atmel_isi_remove,
 };
 
 module_platform_driver(atmel_isi_driver);

diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c
index a1d93c14553d80e7501fdb583c9b9c537dbc31db..6dcc6c13a7540edbd30d9244511f784527a78cf0 100644 (file)
--- a/drivers/media/platform/broadcom/bcm2835-unicam.c
+++ b/drivers/media/platform/broadcom/bcm2835-unicam.c
@@ -2724,7 +2724,7 @@ MODULE_DEVICE_TABLE(of, unicam_of_match);
 
 static struct platform_driver unicam_driver = {
        .probe          = unicam_probe,
-       .remove_new     = unicam_remove,
+       .remove         = unicam_remove,
        .driver = {
                .name   = UNICAM_MODULE_NAME,
                .pm     = pm_ptr(&unicam_pm_ops),

diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 6f7d27a48eff044dcb1d6b9c3d3105aa08054011..4d64df829e7585b6e305651f3ff9bdd008508ec5 100644 (file)
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -751,7 +751,7 @@ MODULE_DEVICE_TABLE(of, csi2rx_of_table);
 
 static struct platform_driver csi2rx_driver = {
        .probe  = csi2rx_probe,
-       .remove_new = csi2rx_remove,
+       .remove = csi2rx_remove,
 
        .driver = {
                .name           = "cdns-csi2rx",

diff --git a/drivers/media/platform/cadence/cdns-csi2tx.c b/drivers/media/platform/cadence/cdns-csi2tx.c
index 3d98f91f1beed3cf0149212baa5f8f553f15b6a7..e22b133f346dfb69a6ee9014fec64d1cc28477be 100644 (file)
--- a/drivers/media/platform/cadence/cdns-csi2tx.c
+++ b/drivers/media/platform/cadence/cdns-csi2tx.c
@@ -644,7 +644,7 @@ static void csi2tx_remove(struct platform_device *pdev)
 
 static struct platform_driver csi2tx_driver = {
        .probe  = csi2tx_probe,
-       .remove_new = csi2tx_remove,
+       .remove = csi2tx_remove,
 
        .driver = {
                .name           = "cdns-csi2tx",

diff --git a/drivers/media/platform/chips-media/coda/coda-common.c b/drivers/media/platform/chips-media/coda/coda-common.c
index 7da0194ec850f02db5a5a143ce43e81d9824c0ec..c3afd63edbb2a0781b9cdb5d11937d229914ae91 100644 (file)
--- a/drivers/media/platform/chips-media/coda/coda-common.c
+++ b/drivers/media/platform/chips-media/coda/coda-common.c
@@ -3346,7 +3346,7 @@ static const struct dev_pm_ops coda_pm_ops = {
 
 static struct platform_driver coda_driver = {
        .probe  = coda_probe,
-       .remove_new = coda_remove,
+       .remove = coda_remove,
        .driver = {
                .name   = CODA_NAME,
                .of_match_table = coda_dt_ids,

diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
index 6649f06147a9a9be15cfac775bdeea1705715ef2..6b294a2d671781cc192cb39a9ae7a3ba59d52a63 100644 (file)
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
@@ -389,7 +389,7 @@ static struct platform_driver wave5_vpu_driver = {
                .pm = &wave5_pm_ops,
                },
        .probe = wave5_vpu_probe,
-       .remove_new = wave5_vpu_remove,
+       .remove = wave5_vpu_remove,
 };
 
 module_platform_driver(wave5_vpu_driver);

diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
index 187f2d8abfbb5d386148ada79d4897b7a78a7dad..25044f15672e9b95265c1c04c82f66c6622a7520 100644 (file)
--- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
+++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
@@ -1619,7 +1619,7 @@ MODULE_DEVICE_TABLE(of, e5010_of_match);
 
 static struct platform_driver e5010_driver = {
        .probe = e5010_probe,
-       .remove_new = e5010_remove,
+       .remove = e5010_remove,
        .driver = {
                .name = E5010_MODULE_NAME,
                .of_match_table = e5010_of_match,

diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c
index f118aaac0b389343e1fe78b539919cf0688608bb..b8b1cf0665ab60786585d2dd7d0cb2caa4ba2a84 100644 (file)
--- a/drivers/media/platform/intel/pxa_camera.c
+++ b/drivers/media/platform/intel/pxa_camera.c
@@ -2460,7 +2460,7 @@ static struct platform_driver pxa_camera_driver = {
                .of_match_table = pxa_camera_of_match,
        },
        .probe          = pxa_camera_probe,
-       .remove_new     = pxa_camera_remove,
+       .remove         = pxa_camera_remove,
 };
 
 module_platform_driver(pxa_camera_driver);

diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 5adcef80c698794b7c446945b1b6915b29604499..7d331c37525a4aa98ec02d2d477ef7d622e87664 100644 (file)
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -993,7 +993,7 @@ static void deinterlace_remove(struct platform_device *pdev)
 
 static struct platform_driver deinterlace_pdrv = {
        .probe          = deinterlace_probe,
-       .remove_new     = deinterlace_remove,
+       .remove         = deinterlace_remove,
        .driver         = {
                .name   = MEM2MEM_NAME,
        },

diff --git a/drivers/media/platform/marvell/mmp-driver.c b/drivers/media/platform/marvell/mmp-driver.c
index ff9d151121d5eb3437f9dc07dd6fee7b1116b7c9..3fd4fc1b9c48f65b0c0a0af0a3cef43cc8c6a3ff 100644 (file)
--- a/drivers/media/platform/marvell/mmp-driver.c
+++ b/drivers/media/platform/marvell/mmp-driver.c
@@ -359,7 +359,7 @@ MODULE_DEVICE_TABLE(of, mmpcam_of_match);
 
 static struct platform_driver mmpcam_driver = {
        .probe          = mmpcam_probe,
-       .remove_new     = mmpcam_remove,
+       .remove         = mmpcam_remove,
        .driver = {
                .name   = "mmp-camera",
                .of_match_table = mmpcam_of_match,

diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index ff2694676355618904edd7f7ad3dbe2ee7da216a..a5bf75eb8b221245b53a2fc08d5514b6ba9d25f0 100644 (file)
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -1960,7 +1960,7 @@ MODULE_DEVICE_TABLE(of, mtk_jpeg_match);
 
 static struct platform_driver mtk_jpeg_driver = {
        .probe = mtk_jpeg_probe,
-       .remove_new = mtk_jpeg_remove,
+       .remove = mtk_jpeg_remove,
        .driver = {
                .name           = MTK_JPEG_NAME,
                .of_match_table = mtk_jpeg_match,

diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
index 917cdf38f230e7f6506da1c859a89f33410bd3ce..80fdc6ff57e0ecdb6eaa1c42aa5050f2dfc53ce6 100644 (file)
--- a/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_core.c
@@ -298,7 +298,7 @@ static const struct dev_pm_ops mtk_mdp_pm_ops = {
 
 static struct platform_driver mtk_mdp_driver = {
        .probe          = mtk_mdp_probe,
-       .remove_new     = mtk_mdp_remove,
+       .remove         = mtk_mdp_remove,
        .driver = {
                .name   = MTK_MDP_MODULE_NAME,
                .pm     = &mtk_mdp_pm_ops,

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
index 37e7b985d52ccad80c381fd04826949d1a86cf58..5e94ff0d0756fc6a525c6707ac36ff34926892d1 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
@@ -413,7 +413,7 @@ static const struct dev_pm_ops mdp_pm_ops = {
 
 static struct platform_driver mdp_driver = {
        .probe          = mdp_probe,
-       .remove_new     = mdp_remove,
+       .remove         = mdp_remove,
        .driver = {
                .name   = MDP_MODULE_NAME,
                .pm     = &mdp_pm_ops,

diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
index 2073781ccadb156116b1cbe86c49b3e06b7a93f3..9247d92d431d8570609423156b989878f7901f1c 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c
@@ -591,7 +591,7 @@ static void mtk_vcodec_dec_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_vcodec_dec_driver = {
        .probe  = mtk_vcodec_probe,
-       .remove_new = mtk_vcodec_dec_remove,
+       .remove = mtk_vcodec_dec_remove,
        .driver = {
                .name   = MTK_VCODEC_DEC_NAME,
                .of_match_table = mtk_vcodec_match,

diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
index 3cb8a16222220e2d5480b48b48879112a68fc11f..a1e4483abcdbdec22afc4747f439ea56c7181b75 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c
@@ -473,7 +473,7 @@ static void mtk_vcodec_enc_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_vcodec_enc_driver = {
        .probe  = mtk_vcodec_probe,
-       .remove_new = mtk_vcodec_enc_remove,
+       .remove = mtk_vcodec_enc_remove,
        .driver = {
                .name   = MTK_VCODEC_ENC_NAME,
                .of_match_table = mtk_vcodec_enc_match,

diff --git a/drivers/media/platform/mediatek/vpu/mtk_vpu.c b/drivers/media/platform/mediatek/vpu/mtk_vpu.c
index 724ae7c2ab3ba2090727b3aa8410fe5dbf5ca10e..8d8319f0cd22190563f57eda4537e21736fd34ce 100644 (file)
--- a/drivers/media/platform/mediatek/vpu/mtk_vpu.c
+++ b/drivers/media/platform/mediatek/vpu/mtk_vpu.c
@@ -1041,7 +1041,7 @@ static const struct dev_pm_ops mtk_vpu_pm = {
 
 static struct platform_driver mtk_vpu_driver = {
        .probe  = mtk_vpu_probe,
-       .remove_new = mtk_vpu_remove,
+       .remove = mtk_vpu_remove,
        .driver = {
                .name   = "mtk_vpu",
                .pm = &mtk_vpu_pm,

diff --git a/drivers/media/platform/microchip/microchip-csi2dc.c b/drivers/media/platform/microchip/microchip-csi2dc.c
index fee73260bb1e112d2ff31a010a16a20fb8af47ac..70303a0b6919eb3a1948ca1060985c3d6a563f4c 100644 (file)
--- a/drivers/media/platform/microchip/microchip-csi2dc.c
+++ b/drivers/media/platform/microchip/microchip-csi2dc.c
@@ -782,7 +782,7 @@ MODULE_DEVICE_TABLE(of, csi2dc_of_match);
 
 static struct platform_driver csi2dc_driver = {
        .probe  = csi2dc_probe,
-       .remove_new = csi2dc_remove,
+       .remove = csi2dc_remove,
        .driver = {
                .name =                 "microchip-csi2dc",
                .pm =                   &csi2dc_dev_pm_ops,

diff --git a/drivers/media/platform/microchip/microchip-sama5d2-isc.c b/drivers/media/platform/microchip/microchip-sama5d2-isc.c
index 60b6d922d764eb16e9cb20cceb575d246e1e917f..66d3d7891991e931084d1ec83b6a114e79919f8b 100644 (file)
--- a/drivers/media/platform/microchip/microchip-sama5d2-isc.c
+++ b/drivers/media/platform/microchip/microchip-sama5d2-isc.c
@@ -658,7 +658,7 @@ MODULE_DEVICE_TABLE(of, microchip_isc_of_match);
 
 static struct platform_driver microchip_isc_driver = {
        .probe  = microchip_isc_probe,
-       .remove_new = microchip_isc_remove,
+       .remove = microchip_isc_remove,
        .driver = {
                .name           = "microchip-sama5d2-isc",
                .pm             = &microchip_isc_dev_pm_ops,

diff --git a/drivers/media/platform/microchip/microchip-sama7g5-isc.c b/drivers/media/platform/microchip/microchip-sama7g5-isc.c
index e97abe3e35af0eec816a48b1ca88dd8ce5846f15..b0302dfc3278d762118c572b255b59482c37844e 100644 (file)
--- a/drivers/media/platform/microchip/microchip-sama7g5-isc.c
+++ b/drivers/media/platform/microchip/microchip-sama7g5-isc.c
@@ -621,7 +621,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match);
 
 static struct platform_driver microchip_xisc_driver = {
        .probe  = microchip_xisc_probe,
-       .remove_new = microchip_xisc_remove,
+       .remove = microchip_xisc_remove,
        .driver = {
                .name           = "microchip-sama7g5-xisc",
                .pm             = &microchip_xisc_dev_pm_ops,

diff --git a/drivers/media/platform/nuvoton/npcm-video.c b/drivers/media/platform/nuvoton/npcm-video.c
index 60fbb91400355c236b8f0b245cff509fc10516cf..3b527029cbbbb22e77724df8557d4944924c3939 100644 (file)
--- a/drivers/media/platform/nuvoton/npcm-video.c
+++ b/drivers/media/platform/nuvoton/npcm-video.c
@@ -1814,7 +1814,7 @@ static struct platform_driver npcm_video_driver = {
                .of_match_table = npcm_video_match,
        },
        .probe = npcm_video_probe,
-       .remove_new = npcm_video_remove,
+       .remove = npcm_video_remove,
 };
 
 module_platform_driver(npcm_video_driver);

diff --git a/drivers/media/platform/nvidia/tegra-vde/vde.c b/drivers/media/platform/nvidia/tegra-vde/vde.c
index 81a0d3b76b88fc97f3ce7aa834afbbb29ca9a283..3232392c60e20853952548aed150d77382c93c36 100644 (file)
--- a/drivers/media/platform/nvidia/tegra-vde/vde.c
+++ b/drivers/media/platform/nvidia/tegra-vde/vde.c
@@ -535,7 +535,7 @@ MODULE_DEVICE_TABLE(of, tegra_vde_of_match);
 
 static struct platform_driver tegra_vde_driver = {
        .probe          = tegra_vde_probe,
-       .remove_new     = tegra_vde_remove,
+       .remove         = tegra_vde_remove,
        .shutdown       = tegra_vde_shutdown,
        .driver         = {
                .name           = "tegra-vde",

diff --git a/drivers/media/platform/nxp/dw100/dw100.c b/drivers/media/platform/nxp/dw100/dw100.c
index 394f1f6129e389964ea6a703f2e977dd73613f86..54ebf59df682e067a5035c5ff399091642c77c97 100644 (file)
--- a/drivers/media/platform/nxp/dw100/dw100.c
+++ b/drivers/media/platform/nxp/dw100/dw100.c
@@ -1688,7 +1688,7 @@ MODULE_DEVICE_TABLE(of, dw100_dt_ids);
 
 static struct platform_driver dw100_driver = {
        .probe          = dw100_probe,
-       .remove_new     = dw100_remove,
+       .remove         = dw100_remove,
        .driver         = {
                .name   = DRV_NAME,
                .pm = &dw100_pm,

diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 0289822cd7f487994cd5b12b3e69a7aaca389522..d8e946aebba276139245de1475b4c54a9fc381ac 100644 (file)
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -2956,7 +2956,7 @@ MODULE_DEVICE_TABLE(of, mxc_jpeg_match);
 
 static struct platform_driver mxc_jpeg_driver = {
        .probe = mxc_jpeg_probe,
-       .remove_new = mxc_jpeg_remove,
+       .remove = mxc_jpeg_remove,
        .driver = {
                .name = "mxc-jpeg",
                .of_match_table = mxc_jpeg_match,

diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c
index 44e1402e8be198bb8d68aa172a9ebd6119fbcb7c..29523bb84d9563e71a4175e8b6d87df2db06b5ea 100644 (file)
--- a/drivers/media/platform/nxp/imx-mipi-csis.c
+++ b/drivers/media/platform/nxp/imx-mipi-csis.c
@@ -1570,7 +1570,7 @@ MODULE_DEVICE_TABLE(of, mipi_csis_of_match);
 
 static struct platform_driver mipi_csis_driver = {
        .probe          = mipi_csis_probe,
-       .remove_new     = mipi_csis_remove,
+       .remove         = mipi_csis_remove,
        .driver         = {
                .of_match_table = mipi_csis_of_match,
                .name           = CSIS_DRIVER_NAME,

diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
index e4427e6487fba763acdfc0e1535431ef33116c0f..e696d377960f9a2c554db2ad2956e8763fdfbead 100644 (file)
--- a/drivers/media/platform/nxp/imx-pxp.c
+++ b/drivers/media/platform/nxp/imx-pxp.c
@@ -1943,7 +1943,7 @@ MODULE_DEVICE_TABLE(of, pxp_dt_ids);
 
 static struct platform_driver pxp_driver = {
        .probe          = pxp_probe,
-       .remove_new     = pxp_remove,
+       .remove         = pxp_remove,
        .driver         = {
                .name   = MEM2MEM_NAME,
                .of_match_table = pxp_dt_ids,

diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index 9566ff738818d60dc202bcb062822be7445bce21..08e36b7bab59ebd4b2b2ed77158055f86429adf1 100644 (file)
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -2281,7 +2281,7 @@ MODULE_DEVICE_TABLE(of, imx7_csi_of_match);
 
 static struct platform_driver imx7_csi_driver = {
        .probe = imx7_csi_probe,
-       .remove_new = imx7_csi_remove,
+       .remove = imx7_csi_remove,
        .driver = {
                .of_match_table = imx7_csi_of_match,
                .name = "imx7-csi",

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
index c2013995049c603af2a57ddd326abc84450e5d95..aaf58063677c5ecc0ad6bd6a4d3f042aced8c267 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
@@ -535,7 +535,7 @@ MODULE_DEVICE_TABLE(of, mxc_isi_of_match);
 
 static struct platform_driver mxc_isi_driver = {
        .probe          = mxc_isi_probe,
-       .remove_new     = mxc_isi_remove,
+       .remove         = mxc_isi_remove,
        .driver = {
                .of_match_table = mxc_isi_of_match,
                .name           = MXC_ISI_DRIVER_NAME,

diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index d4a6c553296990ef209779a0eb21e8835e59e9f1..1f2657cf6e824248748b91f0909fd5bb740afc21 100644 (file)
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
@@ -953,7 +953,7 @@ MODULE_DEVICE_TABLE(of, imx8mq_mipi_csi_of_match);
 
 static struct platform_driver imx8mq_mipi_csi_driver = {
        .probe          = imx8mq_mipi_csi_probe,
-       .remove_new     = imx8mq_mipi_csi_remove,
+       .remove         = imx8mq_mipi_csi_remove,
        .driver         = {
                .of_match_table = imx8mq_mipi_csi_of_match,
                .name           = MIPI_CSI2_DRIVER_NAME,

diff --git a/drivers/media/platform/nxp/mx2_emmaprp.c b/drivers/media/platform/nxp/mx2_emmaprp.c
index 023ed40c6b08362499ab57fb257edc88cbfa8124..bcad0aed7206e28651b54caf8d456d748aeb9abc 100644 (file)
--- a/drivers/media/platform/nxp/mx2_emmaprp.c
+++ b/drivers/media/platform/nxp/mx2_emmaprp.c
@@ -902,7 +902,7 @@ static void emmaprp_remove(struct platform_device *pdev)
 
 static struct platform_driver emmaprp_pdrv = {
        .probe          = emmaprp_probe,
-       .remove_new     = emmaprp_remove,
+       .remove         = emmaprp_remove,
        .driver         = {
                .name   = MEM2MEM_NAME,
        },

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index d64985ca6e884f14cc8ac2fea662e430cc11c020..151e4c4338f000ce572f0e45247909bf094b35c9 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -2497,7 +2497,7 @@ static const struct dev_pm_ops camss_pm_ops = {
 
 static struct platform_driver qcom_camss_driver = {
        .probe = camss_probe,
-       .remove_new = camss_remove,
+       .remove = camss_remove,
        .driver = {
                .name = "qcom-camss",
                .of_match_table = camss_dt_match,

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 84e95a46dfc9832981ac1c0c58e226a506896ade..00eb98f53d4708982aac36d9b0bd455be595bd90 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -949,7 +949,7 @@ MODULE_DEVICE_TABLE(of, venus_dt_match);
 
 static struct platform_driver qcom_venus_driver = {
        .probe = venus_probe,
-       .remove_new = venus_remove,
+       .remove = venus_remove,
        .driver = {
                .name = "qcom-venus",
                .of_match_table = venus_dt_match,

diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 666309f684f138e44a513f49b2fe97e24e09f378..6252a6b3d4ba6d49b343bb53dfb7b0e683410bb4 100644 (file)
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -1877,7 +1877,7 @@ MODULE_DEVICE_TABLE(of, vdec_dt_match);
 
 static struct platform_driver qcom_venus_dec_driver = {
        .probe = vdec_probe,
-       .remove_new = vdec_remove,
+       .remove = vdec_remove,
        .driver = {
                .name = "qcom-venus-decoder",
                .of_match_table = vdec_dt_match,

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 5804a4911537e1ec282907b0e47def262125e589..322a7737e2c7befdebcdf147955ba1d5ba8b42e2 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -1645,7 +1645,7 @@ MODULE_DEVICE_TABLE(of, venc_dt_match);
 
 static struct platform_driver qcom_venus_enc_driver = {
        .probe = venc_probe,
-       .remove_new = venc_remove,
+       .remove = venc_remove,
        .driver = {
                .name = "qcom-venus-encoder",
                .of_match_table = venc_dt_match,

diff --git a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
index 7ce3be626c4a8f32fb66d4eaa2ec444d9e4ea60a..89e36e8219ed8b7cc4040ae1f33ec21bb12778d6 100644 (file)
--- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
@@ -1783,7 +1783,7 @@ MODULE_DEVICE_TABLE(of, pispbe_of_match);
 
 static struct platform_driver pispbe_pdrv = {
        .probe          = pispbe_probe,
-       .remove_new     = pispbe_remove,
+       .remove         = pispbe_remove,
        .driver         = {
                .name   = PISPBE_NAME,
                .of_match_table = pispbe_of_match,

diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index c419ddb4c5a2c121ddea4fc6cec39a6845a99106..c9e2862fcaa536048a1803fdecc2a0b055a52e8f 100644 (file)
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1974,7 +1974,7 @@ static void rcsi2_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver rcar_csi2_pdrv = {
-       .remove_new = rcsi2_remove,
+       .remove = rcsi2_remove,
        .probe  = rcsi2_probe,
        .driver = {
                .name   = "rcar-csi2",

diff --git a/drivers/media/platform/renesas/rcar-fcp.c b/drivers/media/platform/renesas/rcar-fcp.c
index bcef7b87da7c129062249d52a365ac710a94ee87..cee9bbce4e3affb2467dbc28142e1ab2304bf5b0 100644 (file)
--- a/drivers/media/platform/renesas/rcar-fcp.c
+++ b/drivers/media/platform/renesas/rcar-fcp.c
@@ -164,7 +164,7 @@ MODULE_DEVICE_TABLE(of, rcar_fcp_of_match);
 
 static struct platform_driver rcar_fcp_platform_driver = {
        .probe          = rcar_fcp_probe,
-       .remove_new     = rcar_fcp_remove,
+       .remove         = rcar_fcp_remove,
        .driver         = {
                .name   = "rcar-fcp",
                .of_match_table = rcar_fcp_of_match,

diff --git a/drivers/media/platform/renesas/rcar-isp.c b/drivers/media/platform/renesas/rcar-isp.c
index 4512ac338ca53be26298b08b9f254aff17cf0209..8d96b6a2427a70db7aacba0bcebc04feb1c8c21b 100644 (file)
--- a/drivers/media/platform/renesas/rcar-isp.c
+++ b/drivers/media/platform/renesas/rcar-isp.c
@@ -522,7 +522,7 @@ static struct platform_driver rcar_isp_driver = {
                .of_match_table = risp_of_id_table,
        },
        .probe = risp_probe,
-       .remove_new = risp_remove,
+       .remove = risp_remove,
 };
 
 module_platform_driver(rcar_isp_driver);

diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
index 695d884a22d1b9fc494faaa50afb6757bef30846..b738b19ed900719264edef53d5e69b1e9bc4b8b9 100644 (file)
--- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
@@ -1443,7 +1443,7 @@ static struct platform_driver rcar_vin_driver = {
                .of_match_table = rvin_of_id_table,
        },
        .probe = rcar_vin_probe,
-       .remove_new = rcar_vin_remove,
+       .remove = rcar_vin_remove,
 };
 
 module_platform_driver(rcar_vin_driver);

diff --git a/drivers/media/platform/renesas/rcar_drif.c b/drivers/media/platform/renesas/rcar_drif.c
index 5d3109940ded4d59bd7e87813431d59c159bdb96..a7b882975440d0ae0e81fe1b20d1d02affcf97f1 100644 (file)
--- a/drivers/media/platform/renesas/rcar_drif.c
+++ b/drivers/media/platform/renesas/rcar_drif.c
@@ -1475,7 +1475,7 @@ static struct platform_driver rcar_drif_driver = {
                .pm = &rcar_drif_pm_ops,
                },
        .probe = rcar_drif_probe,
-       .remove_new = rcar_drif_remove,
+       .remove = rcar_drif_remove,
 };
 
 module_platform_driver(rcar_drif_driver);

diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
index a2565b269f3bd6a0d6ad0754245fc546e03a7f5e..5827cc33ab50fd05f1e7312ca3f6de070d15c76d 100644 (file)
--- a/drivers/media/platform/renesas/rcar_fdp1.c
+++ b/drivers/media/platform/renesas/rcar_fdp1.c
@@ -2444,7 +2444,7 @@ MODULE_DEVICE_TABLE(of, fdp1_dt_ids);
 
 static struct platform_driver fdp1_pdrv = {
        .probe          = fdp1_probe,
-       .remove_new     = fdp1_remove,
+       .remove         = fdp1_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .of_match_table = fdp1_dt_ids,

diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
index fff349e45067edf006fbe806c410249a416ba6cc..881df8a8a1ac8521d615512320d963debc6a040a 100644 (file)
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -1736,7 +1736,7 @@ static const struct dev_pm_ops jpu_pm_ops = {
 
 static struct platform_driver jpu_driver = {
        .probe = jpu_probe,
-       .remove_new = jpu_remove,
+       .remove = jpu_remove,
        .driver = {
                .of_match_table = jpu_dt_ids,
                .name = DRV_NAME,

diff --git a/drivers/media/platform/renesas/renesas-ceu.c b/drivers/media/platform/renesas/renesas-ceu.c
index 16776027679653e6aa69ad9e3682e5222cd15b99..cacfa3951c4d52b34c7eb9d587540d744f519804 100644 (file)
--- a/drivers/media/platform/renesas/renesas-ceu.c
+++ b/drivers/media/platform/renesas/renesas-ceu.c
@@ -1723,7 +1723,7 @@ static struct platform_driver ceu_driver = {
                .of_match_table = of_match_ptr(ceu_of_match),
        },
        .probe          = ceu_probe,
-       .remove_new     = ceu_remove,
+       .remove         = ceu_remove,
 };
 
 module_platform_driver(ceu_driver);

diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
index 280efd2a8185596a3812d29928358dc54515f834..873b13ec377286e222a37d361f83dc193ba5d216 100644 (file)
--- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
+++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c
@@ -325,7 +325,7 @@ static struct platform_driver rzg2l_cru_driver = {
                .of_match_table = rzg2l_cru_of_id_table,
        },
        .probe = rzg2l_cru_probe,
-       .remove_new = rzg2l_cru_remove,
+       .remove = rzg2l_cru_remove,
 };
 
 module_platform_driver(rzg2l_cru_driver);

diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
index c7fdee347ac8aeb14582fa2885deb4fb57af5e1d..e725982c4705e66c4a35bd147331da64a05e41e3 100644 (file)
--- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
+++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
@@ -868,7 +868,7 @@ static const struct of_device_id rzg2l_csi2_of_table[] = {
 MODULE_DEVICE_TABLE(of, rzg2l_csi2_of_table);
 
 static struct platform_driver rzg2l_csi2_pdrv = {
-       .remove_new = rzg2l_csi2_remove,
+       .remove = rzg2l_csi2_remove,
        .probe  = rzg2l_csi2_probe,
        .driver = {
                .name = "rzg2l-csi2",

diff --git a/drivers/media/platform/renesas/sh_vou.c b/drivers/media/platform/renesas/sh_vou.c
index 1e74dd601c2b72339d5f1ccb935eb2c83cfa1675..d440e54599195bf72bbeeeff221138a3d3902e05 100644 (file)
--- a/drivers/media/platform/renesas/sh_vou.c
+++ b/drivers/media/platform/renesas/sh_vou.c
@@ -1359,7 +1359,7 @@ static void sh_vou_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver sh_vou = {
-       .remove_new = sh_vou_remove,
+       .remove = sh_vou_remove,
        .driver  = {
                .name   = "sh-vou",
        },

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
index 1aac44d687316fafe3cc7d3434cfd7235d166e87..9fc6bf624a520ae38e9c5f30dfa4dfa412eec38e 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
@@ -1005,7 +1005,7 @@ MODULE_DEVICE_TABLE(of, vsp1_of_match);
 
 static struct platform_driver vsp1_platform_driver = {
        .probe          = vsp1_probe,
-       .remove_new     = vsp1_remove,
+       .remove         = vsp1_remove,
        .driver         = {
                .name   = "vsp1",
                .pm     = &vsp1_pm_ops,

diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index de532b7ecd74c13e67866c70f55904f333de96ea..1739ac0c8e9269a7e73b624d6c496f735e80c22a 100644 (file)
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -972,7 +972,7 @@ MODULE_DEVICE_TABLE(of, rockchip_rga_match);
 
 static struct platform_driver rga_pdrv = {
        .probe = rga_probe,
-       .remove_new = rga_remove,
+       .remove = rga_remove,
        .driver = {
                .name = RGA_NAME,
                .pm = &rga_pm,

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index dd114ab77800f8bdff64a1c97b587fd8959b5237..0100b9c3edbefbdc001e2e4d13049efa9493e3bd 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -752,7 +752,7 @@ static struct platform_driver rkisp1_drv = {
                .pm = &rkisp1_pm_ops,
        },
        .probe = rkisp1_probe,
-       .remove_new = rkisp1_remove,
+       .remove = rkisp1_remove,
 };
 
 module_platform_driver(rkisp1_drv);

diff --git a/drivers/media/platform/samsung/exynos-gsc/gsc-core.c b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c
index f45f5c8612a6b33ca6962220dfc9e215dd950e08..a06d7cace92f48f371cb52f28b2a551120218ea9 100644 (file)
--- a/drivers/media/platform/samsung/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c
@@ -1309,7 +1309,7 @@ static const struct dev_pm_ops gsc_pm_ops = {
 
 static struct platform_driver gsc_driver = {
        .probe          = gsc_probe,
-       .remove_new     = gsc_remove,
+       .remove         = gsc_remove,
        .driver = {
                .name   = GSC_MODULE_NAME,
                .pm     = &gsc_pm_ops,

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
index adfc2d73d04b7fd33120b5d05e0e12109476333f..2c9edd0a559b8560233ff81ec81906fc8855efa7 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
@@ -1157,7 +1157,7 @@ static const struct dev_pm_ops fimc_pm_ops = {
 
 static struct platform_driver fimc_driver = {
        .probe          = fimc_probe,
-       .remove_new     = fimc_remove,
+       .remove         = fimc_remove,
        .driver = {
                .of_match_table = fimc_of_match,
                .name           = FIMC_DRIVER_NAME,

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
index 44363c4241d536a8161e3eb3d799b92977a416da..b243cbb1d0100387537cc899fd55743c63c37faa 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
@@ -137,7 +137,7 @@ static const struct of_device_id fimc_is_i2c_of_match[] = {
 
 static struct platform_driver fimc_is_i2c_driver = {
        .probe          = fimc_is_i2c_probe,
-       .remove_new     = fimc_is_i2c_remove,
+       .remove         = fimc_is_i2c_remove,
        .driver = {
                .of_match_table = fimc_is_i2c_of_match,
                .name           = "fimc-isp-i2c",

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
index 0a4b58daf9249fcc68d51b527b33cc3cbcb952c1..2e8fe9e497350bc6136268cecbb433dc6d4b3030 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
@@ -963,7 +963,7 @@ static const struct dev_pm_ops fimc_is_pm_ops = {
 
 static struct platform_driver fimc_is_driver = {
        .probe          = fimc_is_probe,
-       .remove_new     = fimc_is_remove,
+       .remove         = fimc_is_remove,
        .driver = {
                .of_match_table = fimc_is_of_match,
                .name           = FIMC_IS_DRV_NAME,

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c
index 1a4d754432154ce3ff9c0113938cbaad5d80020b..e362719612d2f88c32f284ba97d614eed74009ab 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c
@@ -1654,7 +1654,7 @@ MODULE_DEVICE_TABLE(of, flite_of_match);
 
 static struct platform_driver fimc_lite_driver = {
        .probe          = fimc_lite_probe,
-       .remove_new     = fimc_lite_remove,
+       .remove         = fimc_lite_remove,
        .driver = {
                .of_match_table = flite_of_match,
                .name           = FIMC_LITE_DRV_NAME,

diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
index 5f10bb4eb4f7c947d64b0dfaa5828dcb911090d5..b5ee3c547789382ec6925b05c86272cf426afd5e 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/media-dev.c
+++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c
@@ -1564,7 +1564,7 @@ MODULE_DEVICE_TABLE(of, fimc_md_of_match);
 
 static struct platform_driver fimc_md_driver = {
        .probe          = fimc_md_probe,
-       .remove_new     = fimc_md_remove,
+       .remove         = fimc_md_remove,
        .driver = {
                .of_match_table = of_match_ptr(fimc_md_of_match),
                .name           = "s5p-fimc-md",

diff --git a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
index 4b9b20ba35041c58d670caec11848f504e454f71..63f3eecdd7e6990cbcd735bffbdbf9b92bedeb2b 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
@@ -1020,7 +1020,7 @@ MODULE_DEVICE_TABLE(of, s5pcsis_of_match);
 
 static struct platform_driver s5pcsis_driver = {
        .probe          = s5pcsis_probe,
-       .remove_new     = s5pcsis_remove,
+       .remove         = s5pcsis_remove,
        .driver         = {
                .of_match_table = s5pcsis_of_match,
                .name           = CSIS_DRIVER_NAME,

diff --git a/drivers/media/platform/samsung/s3c-camif/camif-core.c b/drivers/media/platform/samsung/s3c-camif/camif-core.c
index e4529f666e206003c7c7d2bd9ff9b4b20eb30679..de6e8f1518496a4e9163f649b4acc7be324b972c 100644 (file)
--- a/drivers/media/platform/samsung/s3c-camif/camif-core.c
+++ b/drivers/media/platform/samsung/s3c-camif/camif-core.c
@@ -622,7 +622,7 @@ static const struct dev_pm_ops s3c_camif_pm_ops = {
 
 static struct platform_driver s3c_camif_driver = {
        .probe          = s3c_camif_probe,
-       .remove_new     = s3c_camif_remove,
+       .remove         = s3c_camif_remove,
        .id_table       = s3c_camif_driver_ids,
        .driver = {
                .name   = S3C_CAMIF_DRIVER_NAME,

diff --git a/drivers/media/platform/samsung/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c
index 89aeba47ed079ea15342b55e543747f836122d08..e5e55a41bf3e853d82001074ba285224988c4735 100644 (file)
--- a/drivers/media/platform/samsung/s5p-g2d/g2d.c
+++ b/drivers/media/platform/samsung/s5p-g2d/g2d.c
@@ -777,7 +777,7 @@ MODULE_DEVICE_TABLE(of, exynos_g2d_match);
 
 static struct platform_driver g2d_pdrv = {
        .probe          = g2d_probe,
-       .remove_new     = g2d_remove,
+       .remove         = g2d_remove,
        .driver         = {
                .name = G2D_NAME,
                .of_match_table = exynos_g2d_match,

diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
index d2c4a0178b3c5cf0a7c8bd2c4d2d28592468925b..30a6144f2c770db9197e053871971eed2d1eb331 100644 (file)
--- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -3160,7 +3160,7 @@ static void *jpeg_get_drv_data(struct device *dev)
 
 static struct platform_driver s5p_jpeg_driver = {
        .probe = s5p_jpeg_probe,
-       .remove_new = s5p_jpeg_remove,
+       .remove = s5p_jpeg_remove,
        .driver = {
                .of_match_table = samsung_jpeg_match,
                .name           = S5P_JPEG_M2M_NAME,

diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
index 50451984d59f752c20143d5aa8affda341d20570..2fe3c9228ac54c1361a70c30cea6734394fee64b 100644 (file)
--- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
@@ -1721,7 +1721,7 @@ MODULE_DEVICE_TABLE(of, exynos_mfc_match);
 
 static struct platform_driver s5p_mfc_driver = {
        .probe          = s5p_mfc_probe,
-       .remove_new     = s5p_mfc_remove,
+       .remove         = s5p_mfc_remove,
        .driver = {
                .name   = S5P_MFC_NAME,
                .pm     = &s5p_mfc_pm_ops,

diff --git a/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
index c7ee6e1a445146144d4e949119e2819e2c5054c7..3b0066cf2eb0899e74a227554129839656bac6f1 100644 (file)
--- a/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
+++ b/drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c
@@ -1411,7 +1411,7 @@ MODULE_DEVICE_TABLE(of, bdisp_match_types);
 
 static struct platform_driver bdisp_driver = {
        .probe          = bdisp_probe,
-       .remove_new     = bdisp_remove,
+       .remove         = bdisp_remove,
        .driver         = {
                .name           = BDISP_NAME,
                .of_match_table = bdisp_match_types,

diff --git a/drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c
index 67d3d6e50d2e2b910bb8164d5e23c968e374d9b1..7b3a37957e3ae88fbd4c63604b352371a0fb7951 100644 (file)
--- a/drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c
@@ -1158,7 +1158,7 @@ static struct platform_driver c8sectpfe_driver = {
                .of_match_table = c8sectpfe_match,
        },
        .probe  = c8sectpfe_probe,
-       .remove_new = c8sectpfe_remove,
+       .remove = c8sectpfe_remove,
 };
 
 module_platform_driver(c8sectpfe_driver);

diff --git a/drivers/media/platform/st/sti/delta/delta-v4l2.c b/drivers/media/platform/st/sti/delta/delta-v4l2.c
index da402d1e9171a0b0925d4fd41e7743620063aa7e..fdee7fae3a20133b002932c80372ab92c83c7ae5 100644 (file)
--- a/drivers/media/platform/st/sti/delta/delta-v4l2.c
+++ b/drivers/media/platform/st/sti/delta/delta-v4l2.c
@@ -1954,7 +1954,7 @@ MODULE_DEVICE_TABLE(of, delta_match_types);
 
 static struct platform_driver delta_driver = {
        .probe = delta_probe,
-       .remove_new = delta_remove,
+       .remove = delta_remove,
        .driver = {
                   .name = DELTA_NAME,
                   .of_match_table = delta_match_types,

diff --git a/drivers/media/platform/st/sti/hva/hva-v4l2.c b/drivers/media/platform/st/sti/hva/hva-v4l2.c
index 161a5c0fbc4e343b60de8896997a17f3e42684b4..31a94300d6457b8da689e26004d906c11588d8c0 100644 (file)
--- a/drivers/media/platform/st/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/st/sti/hva/hva-v4l2.c
@@ -1456,7 +1456,7 @@ MODULE_DEVICE_TABLE(of, hva_match_types);
 
 static struct platform_driver hva_driver = {
        .probe  = hva_probe,
-       .remove_new = hva_remove,
+       .remove = hva_remove,
        .driver = {
                .name           = HVA_NAME,
                .of_match_table = hva_match_types,

diff --git a/drivers/media/platform/st/stm32/dma2d/dma2d.c b/drivers/media/platform/st/stm32/dma2d/dma2d.c
index 92f1edee58f8992136461b76d97081a02877e2ae..643bda7f9f7d10a4a6b282babfb1504f85c3af5c 100644 (file)
--- a/drivers/media/platform/st/stm32/dma2d/dma2d.c
+++ b/drivers/media/platform/st/stm32/dma2d/dma2d.c
@@ -717,7 +717,7 @@ MODULE_DEVICE_TABLE(of, stm32_dma2d_match);
 
 static struct platform_driver dma2d_pdrv = {
        .probe          = dma2d_probe,
-       .remove_new     = dma2d_remove,
+       .remove         = dma2d_remove,
        .driver         = {
                .name = DMA2D_NAME,
                .of_match_table = stm32_dma2d_match,

diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c
index ff3331af9406890147f02d497c06f093da6a4ac3..a28db89e4b50f739fb5f5f821ac4176bd856b4f5 100644 (file)
--- a/drivers/media/platform/st/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmi.c
@@ -2149,7 +2149,7 @@ static const struct dev_pm_ops dcmi_pm_ops = {
 
 static struct platform_driver stm32_dcmi_driver = {
        .probe          = dcmi_probe,
-       .remove_new     = dcmi_remove,
+       .remove         = dcmi_remove,
        .driver         = {
                .name = DRV_NAME,
                .of_match_table = of_match_ptr(stm32_dcmi_of_match),

diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
index 7f771ea49b78484560af9f543e916406f4f2945e..3806f7c6e2fe2253d763a720ee76b21251677fb5 100644 (file)
--- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-core.c
@@ -583,7 +583,7 @@ static const struct dev_pm_ops dcmipp_pm_ops = {
 
 static struct platform_driver dcmipp_pdrv = {
        .probe          = dcmipp_probe,
-       .remove_new     = dcmipp_remove,
+       .remove         = dcmipp_remove,
        .driver         = {
                .name   = DCMIPP_PDEV_NAME,
                .of_match_table = dcmipp_of_match,

diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
index d07e980aba61c88779ae507097183fadf0d16309..e53a07b770b7e8a50efd1cea3c36443e137b39c7 100644 (file)
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
@@ -340,7 +340,7 @@ static const struct dev_pm_ops sun4i_csi_pm_ops = {
 
 static struct platform_driver sun4i_csi_driver = {
        .probe  = sun4i_csi_probe,
-       .remove_new = sun4i_csi_remove,
+       .remove = sun4i_csi_remove,
        .driver = {
                .name           = "sun4i-csi",
                .of_match_table = sun4i_csi_of_match,

diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index c6ba385c0c8615365f688b37ef56a9aae07ff298..af2a32c226a55ceaf5a05abb0f05c1c2f2c462b8 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -423,7 +423,7 @@ MODULE_DEVICE_TABLE(of, sun6i_csi_of_match);
 
 static struct platform_driver sun6i_csi_platform_driver = {
        .probe  = sun6i_csi_probe,
-       .remove_new = sun6i_csi_remove,
+       .remove = sun6i_csi_remove,
        .driver = {
                .name           = SUN6I_CSI_NAME,
                .of_match_table = sun6i_csi_of_match,

diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
index f9d4dc45b49077c0b3855ddb5ab4e7fb8f463993..b06cb73015cdd1c0aa5bdedea1024336940ebef4 100644 (file)
--- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
+++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
@@ -757,7 +757,7 @@ MODULE_DEVICE_TABLE(of, sun6i_mipi_csi2_of_match);
 
 static struct platform_driver sun6i_mipi_csi2_platform_driver = {
        .probe  = sun6i_mipi_csi2_probe,
-       .remove_new = sun6i_mipi_csi2_remove,
+       .remove = sun6i_mipi_csi2_remove,
        .driver = {
                .name           = SUN6I_MIPI_CSI2_NAME,
                .of_match_table = sun6i_mipi_csi2_of_match,

diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
index 4a5698eb12b77c4d80afc30741f10dd366f7f771..dbc51daa4fe3786c727624c9f2c28ecc9cc32365 100644 (file)
--- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
+++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c
@@ -824,7 +824,7 @@ MODULE_DEVICE_TABLE(of, sun8i_a83t_mipi_csi2_of_match);
 
 static struct platform_driver sun8i_a83t_mipi_csi2_platform_driver = {
        .probe  = sun8i_a83t_mipi_csi2_probe,
-       .remove_new = sun8i_a83t_mipi_csi2_remove,
+       .remove = sun8i_a83t_mipi_csi2_remove,
        .driver = {
                .name           = SUN8I_A83T_MIPI_CSI2_NAME,
                .of_match_table = sun8i_a83t_mipi_csi2_of_match,

diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
index a1c35a2b68ed9017ba4de6a089fbcf62ee623f9c..c55b1761b089778b3ace385da331fa81585ec3d6 100644 (file)
--- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
+++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
@@ -1001,7 +1001,7 @@ static const struct dev_pm_ops deinterlace_pm_ops = {
 
 static struct platform_driver deinterlace_driver = {
        .probe          = deinterlace_probe,
-       .remove_new     = deinterlace_remove,
+       .remove         = deinterlace_remove,
        .driver         = {
                .name           = DEINTERLACE_NAME,
                .of_match_table = deinterlace_dt_match,

diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
index a12323ca89faeb5ecc46eb2d64813c22386e87a9..d60d3496e5b4d6821e1dce42d7f79560a8485179 100644 (file)
--- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
+++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
@@ -905,7 +905,7 @@ static const struct dev_pm_ops rotate_pm_ops = {
 
 static struct platform_driver rotate_driver = {
        .probe          = rotate_probe,
-       .remove_new     = rotate_remove,
+       .remove         = rotate_remove,
        .driver         = {
                .name           = ROTATE_NAME,
                .of_match_table = rotate_dt_match,

diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c
index 009ff68a2b43ca559f0531024c9e039d19472931..edbe0620ecaadf0b53852a6ebc5e983a33a171b9 100644 (file)
--- a/drivers/media/platform/ti/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c
@@ -2617,7 +2617,7 @@ MODULE_DEVICE_TABLE(of, vpfe_of_match);
 
 static struct platform_driver vpfe_driver = {
        .probe          = vpfe_probe,
-       .remove_new     = vpfe_remove,
+       .remove         = vpfe_remove,
        .driver = {
                .name   = VPFE_MODULE_NAME,
                .pm     = &vpfe_pm_ops,

diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/ti/cal/cal.c
index 5c2c04142aeed2a6d5c43e2dbb2f506b6c9529f7..4bd2092e0255f701010bb82e8dbc1fed26121108 100644 (file)
--- a/drivers/media/platform/ti/cal/cal.c
+++ b/drivers/media/platform/ti/cal/cal.c
@@ -1332,7 +1332,7 @@ static const struct dev_pm_ops cal_pm_ops = {
 
 static struct platform_driver cal_pdrv = {
        .probe          = cal_probe,
-       .remove_new     = cal_remove,
+       .remove         = cal_remove,
        .driver         = {
                .name   = CAL_MODULE_NAME,
                .pm     = &cal_pm_ops,

diff --git a/drivers/media/platform/ti/davinci/vpif.c b/drivers/media/platform/ti/davinci/vpif.c
index f4e1fa76bf3724fe75443cede62ca96ba6908143..a81719702a22d18d6e0aede474144f0fd37a9105 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif.c
+++ b/drivers/media/platform/ti/davinci/vpif.c
@@ -589,7 +589,7 @@ static struct platform_driver vpif_driver = {
                .name   = VPIF_DRIVER_NAME,
                .pm     = vpif_pm_ops,
        },
-       .remove_new = vpif_remove,
+       .remove = vpif_remove,
        .probe = vpif_probe,
 };
 

diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
index 16326437767f803f4f474bfbd1d76e6bd001e8ec..8357450b3f01a7da387b8fcb46fe6de765f56568 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_capture.c
+++ b/drivers/media/platform/ti/davinci/vpif_capture.c
@@ -1815,7 +1815,7 @@ static __refdata struct platform_driver vpif_driver = {
                .pm     = &vpif_pm_ops,
        },
        .probe = vpif_probe,
-       .remove_new = vpif_remove,
+       .remove = vpif_remove,
 };
 
 module_platform_driver(vpif_driver);

diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
index 76d8fa8ad088a1910c16c0918dafebed03674c10..bea47e5159de06a9ee537524dee97c7d136e564d 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_display.c
+++ b/drivers/media/platform/ti/davinci/vpif_display.c
@@ -1398,7 +1398,7 @@ static __refdata struct platform_driver vpif_driver = {
                        .pm     = &vpif_pm_ops,
        },
        .probe  = vpif_probe,
-       .remove_new = vpif_remove,
+       .remove = vpif_remove,
 };
 
 module_platform_driver(vpif_driver);

diff --git a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
index 22442fce7607855e85858a3a7625e2192bdfd2da..bd9c9e6ac573af2a564ef1c18feedec0544b64ec 100644 (file)
--- a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
+++ b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
@@ -1163,7 +1163,7 @@ MODULE_DEVICE_TABLE(of, ti_csi2rx_of_match);
 
 static struct platform_driver ti_csi2rx_pdrv = {
        .probe = ti_csi2rx_probe,
-       .remove_new = ti_csi2rx_remove,
+       .remove = ti_csi2rx_remove,
        .driver = {
                .name = TI_CSI2RX_MODULE_NAME,
                .of_match_table = ti_csi2rx_of_match,

diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c
index 1c56b6a87ced4e862087241e9686cd3369b6e617..85dca219042895b686a8c3b9f770f84186dbe478 100644 (file)
--- a/drivers/media/platform/ti/omap/omap_vout.c
+++ b/drivers/media/platform/ti/omap/omap_vout.c
@@ -1721,7 +1721,7 @@ static struct platform_driver omap_vout_driver = {
        .driver = {
                .name = VOUT_NAME,
        },
-       .remove_new = omap_vout_remove,
+       .remove = omap_vout_remove,
 };
 
 static int __init omap_vout_init(void)

diff --git a/drivers/media/platform/ti/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c
index 91101ba88ef01f44ea0a9e764204f9630160938a..405ca215179dd384f9c6834230f44bbb23067eea 100644 (file)
--- a/drivers/media/platform/ti/omap3isp/isp.c
+++ b/drivers/media/platform/ti/omap3isp/isp.c
@@ -2472,7 +2472,7 @@ MODULE_DEVICE_TABLE(of, omap3isp_of_table);
 
 static struct platform_driver omap3isp_driver = {
        .probe = isp_probe,
-       .remove_new = isp_remove,
+       .remove = isp_remove,
        .id_table = omap3isp_id_table,
        .driver = {
                .name = "omap3isp",

diff --git a/drivers/media/platform/ti/vpe/vpe.c b/drivers/media/platform/ti/vpe/vpe.c
index 6848cbc82f5288a4ded6e4596b91c07b988e2781..bd2e97afd776121e5d0813fc722b136eb902f5ec 100644 (file)
--- a/drivers/media/platform/ti/vpe/vpe.c
+++ b/drivers/media/platform/ti/vpe/vpe.c
@@ -2649,7 +2649,7 @@ MODULE_DEVICE_TABLE(of, vpe_of_match);
 
 static struct platform_driver vpe_pdrv = {
        .probe          = vpe_probe,
-       .remove_new     = vpe_remove,
+       .remove         = vpe_remove,
        .driver         = {
                .name   = VPE_MODULE_NAME,
                .of_match_table = of_match_ptr(vpe_of_match),

diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 05bbac853c4fd73174cd376b7edd3152190b1f71..8542238e0fb1d21576f87b8ebb37585a0144c949 100644 (file)
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -1277,7 +1277,7 @@ static const struct dev_pm_ops hantro_pm_ops = {
 
 static struct platform_driver hantro_driver = {
        .probe = hantro_probe,
-       .remove_new = hantro_remove,
+       .remove = hantro_remove,
        .driver = {
                   .name = DRIVER_NAME,
                   .of_match_table = of_hantro_match,

diff --git a/drivers/media/platform/via/via-camera.c b/drivers/media/platform/via/via-camera.c
index 4cb8f29e2f14aa4c6009e752110a58f979ab316f..195e9bf1eedf69c0d27b3a0471a8354599e07853 100644 (file)
--- a/drivers/media/platform/via/via-camera.c
+++ b/drivers/media/platform/via/via-camera.c
@@ -1307,7 +1307,7 @@ static struct platform_driver viacam_driver = {
                .name = "viafb-camera",
        },
        .probe = viacam_probe,
-       .remove_new = viacam_remove,
+       .remove = viacam_remove,
 };
 
 module_platform_driver(viacam_driver);

diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
index 31e9e92e723eb11fde0c6dfe1ef45437e8619d7e..5748aff8fc40b79a5b5da5e2b553f2364a7e609b 100644 (file)
--- a/drivers/media/platform/video-mux.c
+++ b/drivers/media/platform/video-mux.c
@@ -486,7 +486,7 @@ MODULE_DEVICE_TABLE(of, video_mux_dt_ids);
 
 static struct platform_driver video_mux_driver = {
        .probe          = video_mux_probe,
-       .remove_new     = video_mux_remove,
+       .remove         = video_mux_remove,
        .driver         = {
                .of_match_table = video_mux_dt_ids,
                .name = "video-mux",

diff --git a/drivers/media/platform/xilinx/xilinx-csi2rxss.c b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
index f953d5474ae00a31674c99f83f71e626d7231cfb..146131b8f37e5a30b168164d4eaedc9641d6af31 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-csi2rxss.c
+++ b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
@@ -1028,7 +1028,7 @@ static struct platform_driver xcsi2rxss_driver = {
                .of_match_table = xcsi2rxss_of_id_table,
        },
        .probe                  = xcsi2rxss_probe,
-       .remove_new             = xcsi2rxss_remove,
+       .remove                 = xcsi2rxss_remove,
 };
 
 module_platform_driver(xcsi2rxss_driver);

diff --git a/drivers/media/platform/xilinx/xilinx-tpg.c b/drivers/media/platform/xilinx/xilinx-tpg.c
index e05e528ffc6f72129eaaac2e02454c8e8eea725e..f895a9a6575a145faf8ce3bd49cf580c464215b8 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-tpg.c
+++ b/drivers/media/platform/xilinx/xilinx-tpg.c
@@ -920,7 +920,7 @@ static struct platform_driver xtpg_driver = {
                .of_match_table = xtpg_of_id_table,
        },
        .probe                  = xtpg_probe,
-       .remove_new             = xtpg_remove,
+       .remove                 = xtpg_remove,
 };
 
 module_platform_driver(xtpg_driver);

diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c
index bfe48cc0ab52545a65e0854f9d094cc81d13c0e3..024b439feec92c4a2bfdb4d8fd04ad495e90dc1e 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-vipp.c
+++ b/drivers/media/platform/xilinx/xilinx-vipp.c
@@ -618,7 +618,7 @@ static struct platform_driver xvip_composite_driver = {
                .of_match_table = xvip_composite_of_id_table,
        },
        .probe = xvip_composite_probe,
-       .remove_new = xvip_composite_remove,
+       .remove = xvip_composite_remove,
 };
 
 module_platform_driver(xvip_composite_driver);

diff --git a/drivers/media/platform/xilinx/xilinx-vtc.c b/drivers/media/platform/xilinx/xilinx-vtc.c
index dda70719f0045a9b84f48475066d0c6b343bac1e..92fec7bb47dae80b95ffc6c7f4e7dc1bda855383 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-vtc.c
+++ b/drivers/media/platform/xilinx/xilinx-vtc.c
@@ -365,7 +365,7 @@ static struct platform_driver xvtc_driver = {
                .of_match_table = xvtc_of_id_table,
        },
        .probe = xvtc_probe,
-       .remove_new = xvtc_remove,
+       .remove = xvtc_remove,
 };
 
 module_platform_driver(xvtc_driver);

diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index b2c5809a8bc71f0da56c110e8878c6415e5a6d4c..9980346cb5ea3897e515a0042cdb6c7b24334b01 100644 (file)
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1513,7 +1513,7 @@ static struct platform_driver si476x_radio_driver = {
                .name   = DRIVER_NAME,
        },
        .probe          = si476x_radio_probe,
-       .remove_new     = si476x_radio_remove,
+       .remove         = si476x_radio_remove,
 };
 module_platform_driver(si476x_radio_driver);
 

diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index 04daa9c358c27f8bc482a40c2928858cbc456e24..a6069b106fd3048b2c730e9c45fd82f0b7302bfb 100644 (file)
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -164,7 +164,7 @@ static struct platform_driver timbradio_platform_driver = {
                .name   = DRIVER_NAME,
        },
        .probe          = timbradio_probe,
-       .remove_new     = timbradio_remove,
+       .remove         = timbradio_remove,
 };
 
 module_platform_driver(timbradio_platform_driver);

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index f6b98c304b72c9c9d8dd61a6c855b161a1fb9f35..511a8ede05ecdcf369befaedc5f4e4e7aa56eb7a 100644 (file)
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -2145,7 +2145,7 @@ pdata_err:
 
 static struct platform_driver wl1273_fm_radio_driver = {
        .probe          = wl1273_fm_radio_probe,
-       .remove_new     = wl1273_fm_radio_remove,
+       .remove         = wl1273_fm_radio_remove,
        .driver         = {
                .name   = "wl1273_fm_radio",
        },

diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
index 9fdaed68a962ef0bff1e55f5d99ede2024126248..67b4afadc95a3e6b8e5ca8a7ee86039f57f913e6 100644 (file)
--- a/drivers/media/radio/si4713/radio-platform-si4713.c
+++ b/drivers/media/radio/si4713/radio-platform-si4713.c
@@ -205,7 +205,7 @@ static struct platform_driver radio_si4713_pdriver = {
                .name   = "radio-si4713",
        },
        .probe          = radio_si4713_pdriver_probe,
-       .remove_new     = radio_si4713_pdriver_remove,
+       .remove         = radio_si4713_pdriver_remove,
 };
 
 module_platform_driver(radio_si4713_pdriver);

diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index b29a1a9f381da308a91f1a74c70235a3ef3b2cb2..bf6d8fa983bfb41e93a678fd20af3224828ac1e7 100644 (file)
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -201,7 +201,7 @@ MODULE_DEVICE_TABLE(of, gpio_ir_recv_of_match);
 
 static struct platform_driver gpio_ir_recv_driver = {
        .probe  = gpio_ir_recv_probe,
-       .remove_new = gpio_ir_recv_remove,
+       .remove = gpio_ir_recv_remove,
        .driver = {
                .name   = KBUILD_MODNAME,
                .of_match_table = gpio_ir_recv_of_match,

diff --git a/drivers/media/rc/img-ir/img-ir-core.c b/drivers/media/rc/img-ir/img-ir-core.c
index d87d8e14c5568179c6b475f76aa136eb69eecce6..067f4bc7fcc32677c0bb7b23d73fb24d6bbde460 100644 (file)
--- a/drivers/media/rc/img-ir/img-ir-core.c
+++ b/drivers/media/rc/img-ir/img-ir-core.c
@@ -181,7 +181,7 @@ static struct platform_driver img_ir_driver = {
                .pm = &img_ir_pmops,
        },
        .probe = img_ir_probe,
-       .remove_new = img_ir_remove,
+       .remove = img_ir_remove,
 };
 
 module_platform_driver(img_ir_driver);

diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
index de5bb9a08ea4c013bbf36bb020fa23b4aa698891..afd80d2350c6d396afd4ea25a65783a7a8127c24 100644 (file)
--- a/drivers/media/rc/ir-hix5hd2.c
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -394,7 +394,7 @@ static struct platform_driver hix5hd2_ir_driver = {
                .pm     = &hix5hd2_ir_pm_ops,
        },
        .probe = hix5hd2_ir_probe,
-       .remove_new = hix5hd2_ir_remove,
+       .remove = hix5hd2_ir_remove,
 };
 
 module_platform_driver(hix5hd2_ir_driver);

diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c
index 9cdb45821eccd6717ffe0bf15af5acac292a6f36..272ebb0d97c81156070013ae73a6c64479caea48 100644 (file)
--- a/drivers/media/rc/meson-ir.c
+++ b/drivers/media/rc/meson-ir.c
@@ -628,7 +628,7 @@ MODULE_DEVICE_TABLE(of, meson_ir_match);
 
 static struct platform_driver meson_ir_driver = {
        .probe          = meson_ir_probe,
-       .remove_new     = meson_ir_remove,
+       .remove         = meson_ir_remove,
        .shutdown       = meson_ir_shutdown,
        .driver = {
                .name           = DRIVER_NAME,

diff --git a/drivers/media/rc/mtk-cir.c b/drivers/media/rc/mtk-cir.c
index b2f82b2d1c8d40c7050b6ebd330735bd298fa164..85c9436b0a200433e21566304d085e6d50890456 100644 (file)
--- a/drivers/media/rc/mtk-cir.c
+++ b/drivers/media/rc/mtk-cir.c
@@ -440,7 +440,7 @@ static void mtk_ir_remove(struct platform_device *pdev)
 
 static struct platform_driver mtk_ir_driver = {
        .probe          = mtk_ir_probe,
-       .remove_new     = mtk_ir_remove,
+       .remove         = mtk_ir_remove,
        .driver = {
                .name = MTK_IR_DEV,
                .of_match_table = mtk_ir_match,

diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c
index 988b09191c4c7479b4c06b6af75c9f3a2efb8aaf..6539fa0a6e79058a96ed434ff5d6e6045c053346 100644 (file)
--- a/drivers/media/rc/st_rc.c
+++ b/drivers/media/rc/st_rc.c
@@ -408,7 +408,7 @@ static struct platform_driver st_rc_driver = {
                .pm     = &st_rc_pm_ops,
        },
        .probe = st_rc_probe,
-       .remove_new = st_rc_remove,
+       .remove = st_rc_remove,
 };
 
 module_platform_driver(st_rc_driver);

diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
index b49df8355e6b39496d539b4b410b55eaf405a6bd..92ef4e7c6f69fc4d66ffb55ba89066bcc2410005 100644 (file)
--- a/drivers/media/rc/sunxi-cir.c
+++ b/drivers/media/rc/sunxi-cir.c
@@ -413,7 +413,7 @@ MODULE_DEVICE_TABLE(of, sunxi_ir_match);
 
 static struct platform_driver sunxi_ir_driver = {
        .probe          = sunxi_ir_probe,
-       .remove_new     = sunxi_ir_remove,
+       .remove         = sunxi_ir_remove,
        .shutdown       = sunxi_ir_shutdown,
        .driver = {
                .name = SUNXI_IR_DEV,

diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/media/test-drivers/vicodec/vicodec-core.c
index 846e90c062910e8cc58c581a32c0d401972444a0..1e6e3b7140a9403f3e3de1f67bd210998fac5236 100644 (file)
--- a/drivers/media/test-drivers/vicodec/vicodec-core.c
+++ b/drivers/media/test-drivers/vicodec/vicodec-core.c
@@ -2207,7 +2207,7 @@ static void vicodec_remove(struct platform_device *pdev)
 
 static struct platform_driver vicodec_pdrv = {
        .probe          = vicodec_probe,
-       .remove_new     = vicodec_remove,
+       .remove         = vicodec_remove,
        .driver         = {
                .name   = VICODEC_NAME,
        },

diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
index 613949df897d34ea7c00da3803a79c964066f16e..e1dd8adeba469feef0749f491e2f52ac33dbd2a4 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
@@ -572,7 +572,7 @@ static struct platform_driver vidtv_bridge_driver = {
                .name = VIDTV_PDEV_NAME,
        },
        .probe    = vidtv_bridge_probe,
-       .remove_new = vidtv_bridge_remove,
+       .remove = vidtv_bridge_remove,
 };
 
 static void __exit vidtv_bridge_exit(void)

diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c
index 3e3b424b4860580f8b670c75e84240a0f23d9ac3..d4e27279dd0c94b2be152f5ca4902dcc013faeac 100644 (file)
--- a/drivers/media/test-drivers/vim2m.c
+++ b/drivers/media/test-drivers/vim2m.c
@@ -1394,7 +1394,7 @@ static void vim2m_remove(struct platform_device *pdev)
 
 static struct platform_driver vim2m_pdrv = {
        .probe          = vim2m_probe,
-       .remove_new     = vim2m_remove,
+       .remove         = vim2m_remove,
        .driver         = {
                .name   = MEM2MEM_NAME,
        },

diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
index 2083c60e34d6a661a66fa30a94f5050b5040da27..c812fa9f0650b7b2eee3eb93adc2a9ac1254429c 100644 (file)
--- a/drivers/media/test-drivers/vimc/vimc-core.c
+++ b/drivers/media/test-drivers/vimc/vimc-core.c
@@ -410,7 +410,7 @@ static struct platform_device vimc_pdev = {
 
 static struct platform_driver vimc_pdrv = {
        .probe          = vimc_probe,
-       .remove_new     = vimc_remove,
+       .remove         = vimc_remove,
        .driver         = {
                .name   = VIMC_PDEV_NAME,
        },

diff --git a/drivers/media/test-drivers/visl/visl-core.c b/drivers/media/test-drivers/visl/visl-core.c
index c46464bcaf2e13e9c14d2ad8e0a0c751f75182fc..01c964ea6f7675c51f63ec548071adc721521fef 100644 (file)
--- a/drivers/media/test-drivers/visl/visl-core.c
+++ b/drivers/media/test-drivers/visl/visl-core.c
@@ -523,7 +523,7 @@ static void visl_remove(struct platform_device *pdev)
 
 static struct platform_driver visl_pdrv = {
        .probe          = visl_probe,
-       .remove_new     = visl_remove,
+       .remove         = visl_remove,
        .driver         = {
                .name   = VISL_NAME,
        },

diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c
index 00e0d08af3573bdd7687cd00baff76fed37340cb..8d8f60e15d1d8d9aa743e7158d910804ffc994ba 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-core.c
+++ b/drivers/media/test-drivers/vivid/vivid-core.c
@@ -2239,7 +2239,7 @@ static struct platform_device vivid_pdev = {
 
 static struct platform_driver vivid_pdrv = {
        .probe          = vivid_probe,
-       .remove_new     = vivid_remove,
+       .remove         = vivid_remove,
        .driver         = {
                .name   = "vivid",
        },

diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 4d5b1c878028d2c0a62a714174006517e1eac008..9186174a46fd2bcfbda9a05dea3050bc6326e53a 100644 (file)
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -444,7 +444,7 @@ static struct platform_driver it913x_driver = {
                .suppress_bind_attrs    = true,
        },
        .probe          = it913x_probe,
-       .remove_new     = it913x_remove,
+       .remove         = it913x_remove,
        .id_table       = it913x_id_table,
 };