staging: 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 staging drivers 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: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20241001085751.282113-1-sergio.paracuellos@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index 1bbb9a6db5979aff0ed1a17ed2aa955e2bfbf487..7540c20090c78b817c1fb825a2fe340912e4b9a4 100644 (file)
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -919,7 +919,7 @@ static struct platform_driver axis_fifo_driver = {
                .of_match_table = axis_fifo_of_match,
        },
        .probe          = axis_fifo_probe,
-       .remove_new     = axis_fifo_remove,
+       .remove         = axis_fifo_remove,
 };
 
 static int __init axis_fifo_init(void)

diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
index 3e00a26a29d5c346734ec3189380a1c66bf89f80..317be17b95c1672404fc6aecda24d0a1f563685d 100644 (file)
--- a/drivers/staging/fbtft/fbtft.h
+++ b/drivers/staging/fbtft/fbtft.h
@@ -330,7 +330,7 @@ static struct platform_driver fbtft_driver_platform_driver = {             \
                .of_match_table = dt_ids,                                  \
        },                                                                 \
        .probe  = fbtft_driver_probe_pdev,                                 \
-       .remove_new = fbtft_driver_remove_pdev,                            \
+       .remove = fbtft_driver_remove_pdev,                                \
 };                                                                         \
                                                                           \
 static int __init fbtft_driver_module_init(void)                           \

diff --git a/drivers/staging/fieldbus/anybuss/arcx-anybus.c b/drivers/staging/fieldbus/anybuss/arcx-anybus.c
index fcd3e3722ae017f7714e7bac786e48b48eb2b33c..cda0d2cf84c52c71b8f65be8bd7937fc70431ae3 100644 (file)
--- a/drivers/staging/fieldbus/anybuss/arcx-anybus.c
+++ b/drivers/staging/fieldbus/anybuss/arcx-anybus.c
@@ -343,7 +343,7 @@ MODULE_DEVICE_TABLE(of, controller_of_match);
 
 static struct platform_driver controller_driver = {
        .probe = controller_probe,
-       .remove_new = controller_remove,
+       .remove = controller_remove,
        .driver         = {
                .name   = "arcx-anybus-controller",
                .of_match_table = controller_of_match,

diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
index aa6f266b62a1417408e11b68f2f624b4c40bec7d..90ab32638d3f59570da774e95d59db1257cde37e 100644 (file)
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -470,7 +470,7 @@ MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match);
 
 static struct platform_driver arche_apb_ctrl_device_driver = {
        .probe          = arche_apb_ctrl_probe,
-       .remove_new     = arche_apb_ctrl_remove,
+       .remove         = arche_apb_ctrl_remove,
        .shutdown       = arche_apb_ctrl_shutdown,
        .driver         = {
                .name   = "arche-apb-ctrl",

diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index b33977ccd5271064a1b588df6e529e1684c2d190..d48464390f58e23af3d1c2c83d7e3dd8c3a75132 100644 (file)
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -623,7 +623,7 @@ MODULE_DEVICE_TABLE(of, arche_platform_of_match);
 
 static struct platform_driver arche_platform_device_driver = {
        .probe          = arche_platform_probe,
-       .remove_new     = arche_platform_remove,
+       .remove         = arche_platform_remove,
        .shutdown       = arche_platform_shutdown,
        .driver         = {
                .name   = "arche-platform-ctrl",

diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c
index 712f916f0935f5be7d4284cf2698828ef89a7e64..71e6e278a4b3cc6c8118f884d556ac47e2f8c9dc 100644 (file)
--- a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c
+++ b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c
@@ -629,7 +629,7 @@ MODULE_DEVICE_TABLE(of, atmel_isc_of_match);
 
 static struct platform_driver atmel_isc_driver = {
        .probe  = atmel_isc_probe,
-       .remove_new = atmel_isc_remove,
+       .remove = atmel_isc_remove,
        .driver = {
                .name           = "atmel-sama5d2-isc",
                .pm             = &atmel_isc_dev_pm_ops,

diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c
index 9485167d5b7d7385431df579afaa879531680baa..1f74c2dd044cfb9e7df926524171ac758d9b53b2 100644 (file)
--- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c
+++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c
@@ -592,7 +592,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/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 785aac88192212bcb31d6145522f5ebb2b356feb..3edbc57be2caa76d0f1236fc4337992095962475 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -2076,7 +2076,7 @@ MODULE_DEVICE_TABLE(platform, imx_csi_ids);
 
 static struct platform_driver imx_csi_driver = {
        .probe = imx_csi_probe,
-       .remove_new = imx_csi_remove,
+       .remove = imx_csi_remove,
        .id_table = imx_csi_ids,
        .driver = {
                .name = "imx-ipuv3-csi",

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index be54dca11465dc4eb0112fc44556596e05a17d83..a08389b99d14acceb50ba854f0c579fc646ac808 100644 (file)
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -129,7 +129,7 @@ MODULE_DEVICE_TABLE(of, imx_media_dt_ids);
 
 static struct platform_driver imx_media_pdrv = {
        .probe          = imx_media_probe,
-       .remove_new     = imx_media_remove,
+       .remove         = imx_media_remove,
        .driver         = {
                .name   = "imx-media",
                .of_match_table = imx_media_dt_ids,

diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index 0d8b420616235dd32d155de4ce489cd5acc63752..dd8c7b3233bccfc34b59e0f0ff813b36752e1526 100644 (file)
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -836,7 +836,7 @@ static struct platform_driver csi2_driver = {
                .of_match_table = csi2_dt_ids,
        },
        .probe = csi2_probe,
-       .remove_new = csi2_remove,
+       .remove = csi2_remove,
 };
 
 module_platform_driver(csi2_driver);

diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index 5e5b296f93bab4faf01f1e4238057e072e540680..6bf7ade0c6a15d62c614323d443661b5ee71c96b 100644 (file)
--- a/drivers/staging/media/meson/vdec/vdec.c
+++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -1119,7 +1119,7 @@ static void vdec_remove(struct platform_device *pdev)
 
 static struct platform_driver meson_vdec_driver = {
        .probe = vdec_probe,
-       .remove_new = vdec_remove,
+       .remove = vdec_remove,
        .driver = {
                .name = "meson-vdec",
                .of_match_table = vdec_dt_match,

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 0c4283bb48ad39db02a090b8e475bc134f6b6628..61cea89c042b7bc1923d7983239a8bde8fecb8aa 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1340,7 +1340,7 @@ MODULE_DEVICE_TABLE(platform, omap4iss_id_table);
 
 static struct platform_driver iss_driver = {
        .probe          = iss_probe,
-       .remove_new     = iss_remove,
+       .remove         = iss_remove,
        .id_table       = omap4iss_id_table,
        .driver = {
                .name   = "omap4iss",

diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index ac398b5a97360446672a8a5c40ea05bcf222f557..433df4778c9576620bbc6f932fb1fa98fe1cea69 100644 (file)
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -1103,7 +1103,7 @@ static const struct dev_pm_ops rkvdec_pm_ops = {
 
 static struct platform_driver rkvdec_driver = {
        .probe = rkvdec_probe,
-       .remove_new = rkvdec_remove,
+       .remove = rkvdec_remove,
        .driver = {
                   .name = "rkvdec",
                   .of_match_table = of_rkvdec_match,

diff --git a/drivers/staging/media/starfive/camss/stf-camss.c b/drivers/staging/media/starfive/camss/stf-camss.c
index b6d34145bc191e8f2e39713553c28ce0c6ca2d9f..259aaad010d2f02b620ce7ac98517c75134566bb 100644 (file)
--- a/drivers/staging/media/starfive/camss/stf-camss.c
+++ b/drivers/staging/media/starfive/camss/stf-camss.c
@@ -422,7 +422,7 @@ static const struct dev_pm_ops stfcamss_pm_ops = {
 
 static struct platform_driver stfcamss_driver = {
        .probe = stfcamss_probe,
-       .remove_new = stfcamss_remove,
+       .remove = stfcamss_remove,
        .driver = {
                .name = "starfive-camss",
                .pm = &stfcamss_pm_ops,

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index f52df683604525fd17b82087ef7f867f2d9155a2..52a9588462ce5898705cc351fa461f3c49600ad2 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -705,7 +705,7 @@ static const struct dev_pm_ops cedrus_dev_pm_ops = {
 
 static struct platform_driver cedrus_driver = {
        .probe          = cedrus_probe,
-       .remove_new     = cedrus_remove,
+       .remove         = cedrus_remove,
        .driver         = {
                .name           = CEDRUS_NAME,
                .of_match_table = cedrus_dt_match,

diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c
index 58f8ae92320d676058d170cc0871df70b2571559..6877f2beee8c8c069a0aa1aeeafd052acc713164 100644 (file)
--- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c
+++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c
@@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match);
 
 static struct platform_driver sun6i_isp_platform_driver = {
        .probe  = sun6i_isp_probe,
-       .remove_new = sun6i_isp_remove,
+       .remove = sun6i_isp_remove,
        .driver = {
                .name           = SUN6I_ISP_NAME,
                .of_match_table = sun6i_isp_of_match,

diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
index 255cccd0c5fda8e47455142451f56d27bcd7a608..604185c00a1a39e34357e3beefa75aa87b0a1189 100644 (file)
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -858,5 +858,5 @@ struct platform_driver tegra_csi_driver = {
                .pm             = &tegra_csi_pm_ops,
        },
        .probe                  = tegra_csi_probe,
-       .remove_new             = tegra_csi_remove,
+       .remove                 = tegra_csi_remove,
 };

diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index 57a856a21e9013e5b179e45e42a4512ff466de0a..c068dfedd97acd89c06b891297d0ca088d224045 100644 (file)
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -1979,5 +1979,5 @@ struct platform_driver tegra_vi_driver = {
                .pm = &tegra_vi_pm_ops,
        },
        .probe = tegra_vi_probe,
-       .remove_new = tegra_vi_remove,
+       .remove = tegra_vi_remove,
 };

diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c
index 8504b9ea9cea2ce27164c689116663a820608706..5ec717f3afd503b1ef7e3690d3f028531c1afa9f 100644 (file)
--- a/drivers/staging/media/tegra-video/vip.c
+++ b/drivers/staging/media/tegra-video/vip.c
@@ -281,5 +281,5 @@ struct platform_driver tegra_vip_driver = {
                .of_match_table = tegra_vip_of_id_table,
        },
        .probe                  = tegra_vip_probe,
-       .remove_new             = tegra_vip_remove,
+       .remove                 = tegra_vip_remove,
 };

diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c
index ed6a9cc8854129ea9526eb6f37f7cc6d8edce140..dad2abe6c0c90e0af0902d2022a8438370d4c5aa 100644 (file)
--- a/drivers/staging/most/dim2/dim2.c
+++ b/drivers/staging/most/dim2/dim2.c
@@ -1090,7 +1090,7 @@ MODULE_DEVICE_TABLE(of, dim2_of_match);
 
 static struct platform_driver dim2_driver = {
        .probe = dim2_probe,
-       .remove_new = dim2_remove,
+       .remove = dim2_remove,
        .driver = {
                .name = "hdm_dim2",
                .of_match_table = dim2_of_match,

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 977f8fc29e631f1a391da08531a51a98c4a0e443..263774e6a78cae913ebd74af5d16ed0dc6ee86ad 100644 (file)
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -952,7 +952,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
 
 static struct platform_driver nvec_device_driver = {
        .probe   = tegra_nvec_probe,
-       .remove_new = tegra_nvec_remove,
+       .remove = tegra_nvec_remove,
        .driver  = {
                .name = "nvec",
                .pm = &nvec_pm_ops,

diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index d0259c80f8105e6529262329e5ad0ce4405e512f..d2b91318f1516f2e9f8edbe4f68731595999f4c5 100644 (file)
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -175,7 +175,7 @@ static void nvec_kbd_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_kbd_driver = {
        .probe  = nvec_kbd_probe,
-       .remove_new = nvec_kbd_remove,
+       .remove = nvec_kbd_remove,
        .driver = {
                .name = "nvec-kbd",
        },

diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c
index 9943b1fff1905d4cfc5ebf6274ecd65598f7680a..e0e67a3eb7222b38a45aa61fd23db0336d5b21a0 100644 (file)
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -433,7 +433,7 @@ static void nvec_power_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_power_driver = {
        .probe = nvec_power_probe,
-       .remove_new = nvec_power_remove,
+       .remove = nvec_power_remove,
        .driver = {
                   .name = "nvec-power",
        }

diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index f34016c4a26b6ecafdf68bb28989e8852d1bd925..575233fa1677eaab75b28448f3a15f9839527b12 100644 (file)
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -175,7 +175,7 @@ static SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend,
 
 static struct platform_driver nvec_mouse_driver = {
        .probe  = nvec_mouse_probe,
-       .remove_new = nvec_mouse_remove,
+       .remove = nvec_mouse_remove,
        .driver = {
                .name = "nvec-mouse",
                .pm = &nvec_mouse_pm_ops,

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index a5e99cc78a454f5666b6bb3632e701e794db781e..eadb74fc14c8d9d88731c2b500ef38d27fa56cfb 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -977,7 +977,7 @@ MODULE_DEVICE_TABLE(of, cvm_oct_match);
 
 static struct platform_driver cvm_oct_driver = {
        .probe          = cvm_oct_probe,
-       .remove_new     = cvm_oct_remove,
+       .remove         = cvm_oct_remove,
        .driver         = {
                .name   = KBUILD_MODNAME,
                .of_match_table = cvm_oct_match,

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 3dbeffc650d339fec21461e3353643e40da892bd..e09642a19243b8cdd41a330f3ea4663093ec9b29 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1799,7 +1799,7 @@ static struct platform_driver vchiq_driver = {
                .of_match_table = vchiq_of_match,
        },
        .probe = vchiq_probe,
-       .remove_new = vchiq_remove,
+       .remove = vchiq_remove,
 };
 
 static int __init vchiq_driver_init(void)