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

After commit 0edb555a65 ("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>
This commit is contained in:
Sergio Paracuellos 2024-10-01 10:57:51 +02:00 committed by Greg Kroah-Hartman
parent d09d348596
commit c1a5060ec8
26 changed files with 26 additions and 26 deletions

View File

@ -919,7 +919,7 @@ static struct platform_driver axis_fifo_driver = {
.of_match_table = axis_fifo_of_match, .of_match_table = axis_fifo_of_match,
}, },
.probe = axis_fifo_probe, .probe = axis_fifo_probe,
.remove_new = axis_fifo_remove, .remove = axis_fifo_remove,
}; };
static int __init axis_fifo_init(void) static int __init axis_fifo_init(void)

View File

@ -330,7 +330,7 @@ static struct platform_driver fbtft_driver_platform_driver = { \
.of_match_table = dt_ids, \ .of_match_table = dt_ids, \
}, \ }, \
.probe = fbtft_driver_probe_pdev, \ .probe = fbtft_driver_probe_pdev, \
.remove_new = fbtft_driver_remove_pdev, \ .remove = fbtft_driver_remove_pdev, \
}; \ }; \
\ \
static int __init fbtft_driver_module_init(void) \ static int __init fbtft_driver_module_init(void) \

View File

@ -343,7 +343,7 @@ MODULE_DEVICE_TABLE(of, controller_of_match);
static struct platform_driver controller_driver = { static struct platform_driver controller_driver = {
.probe = controller_probe, .probe = controller_probe,
.remove_new = controller_remove, .remove = controller_remove,
.driver = { .driver = {
.name = "arcx-anybus-controller", .name = "arcx-anybus-controller",
.of_match_table = controller_of_match, .of_match_table = controller_of_match,

View File

@ -470,7 +470,7 @@ MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match);
static struct platform_driver arche_apb_ctrl_device_driver = { static struct platform_driver arche_apb_ctrl_device_driver = {
.probe = arche_apb_ctrl_probe, .probe = arche_apb_ctrl_probe,
.remove_new = arche_apb_ctrl_remove, .remove = arche_apb_ctrl_remove,
.shutdown = arche_apb_ctrl_shutdown, .shutdown = arche_apb_ctrl_shutdown,
.driver = { .driver = {
.name = "arche-apb-ctrl", .name = "arche-apb-ctrl",

View File

@ -623,7 +623,7 @@ MODULE_DEVICE_TABLE(of, arche_platform_of_match);
static struct platform_driver arche_platform_device_driver = { static struct platform_driver arche_platform_device_driver = {
.probe = arche_platform_probe, .probe = arche_platform_probe,
.remove_new = arche_platform_remove, .remove = arche_platform_remove,
.shutdown = arche_platform_shutdown, .shutdown = arche_platform_shutdown,
.driver = { .driver = {
.name = "arche-platform-ctrl", .name = "arche-platform-ctrl",

View File

@ -629,7 +629,7 @@ MODULE_DEVICE_TABLE(of, atmel_isc_of_match);
static struct platform_driver atmel_isc_driver = { static struct platform_driver atmel_isc_driver = {
.probe = atmel_isc_probe, .probe = atmel_isc_probe,
.remove_new = atmel_isc_remove, .remove = atmel_isc_remove,
.driver = { .driver = {
.name = "atmel-sama5d2-isc", .name = "atmel-sama5d2-isc",
.pm = &atmel_isc_dev_pm_ops, .pm = &atmel_isc_dev_pm_ops,

View File

@ -592,7 +592,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match);
static struct platform_driver microchip_xisc_driver = { static struct platform_driver microchip_xisc_driver = {
.probe = microchip_xisc_probe, .probe = microchip_xisc_probe,
.remove_new = microchip_xisc_remove, .remove = microchip_xisc_remove,
.driver = { .driver = {
.name = "microchip-sama7g5-xisc", .name = "microchip-sama7g5-xisc",
.pm = &microchip_xisc_dev_pm_ops, .pm = &microchip_xisc_dev_pm_ops,

View File

@ -2076,7 +2076,7 @@ MODULE_DEVICE_TABLE(platform, imx_csi_ids);
static struct platform_driver imx_csi_driver = { static struct platform_driver imx_csi_driver = {
.probe = imx_csi_probe, .probe = imx_csi_probe,
.remove_new = imx_csi_remove, .remove = imx_csi_remove,
.id_table = imx_csi_ids, .id_table = imx_csi_ids,
.driver = { .driver = {
.name = "imx-ipuv3-csi", .name = "imx-ipuv3-csi",

View File

@ -129,7 +129,7 @@ MODULE_DEVICE_TABLE(of, imx_media_dt_ids);
static struct platform_driver imx_media_pdrv = { static struct platform_driver imx_media_pdrv = {
.probe = imx_media_probe, .probe = imx_media_probe,
.remove_new = imx_media_remove, .remove = imx_media_remove,
.driver = { .driver = {
.name = "imx-media", .name = "imx-media",
.of_match_table = imx_media_dt_ids, .of_match_table = imx_media_dt_ids,

View File

@ -836,7 +836,7 @@ static struct platform_driver csi2_driver = {
.of_match_table = csi2_dt_ids, .of_match_table = csi2_dt_ids,
}, },
.probe = csi2_probe, .probe = csi2_probe,
.remove_new = csi2_remove, .remove = csi2_remove,
}; };
module_platform_driver(csi2_driver); module_platform_driver(csi2_driver);

View File

@ -1119,7 +1119,7 @@ static void vdec_remove(struct platform_device *pdev)
static struct platform_driver meson_vdec_driver = { static struct platform_driver meson_vdec_driver = {
.probe = vdec_probe, .probe = vdec_probe,
.remove_new = vdec_remove, .remove = vdec_remove,
.driver = { .driver = {
.name = "meson-vdec", .name = "meson-vdec",
.of_match_table = vdec_dt_match, .of_match_table = vdec_dt_match,

View File

@ -1340,7 +1340,7 @@ MODULE_DEVICE_TABLE(platform, omap4iss_id_table);
static struct platform_driver iss_driver = { static struct platform_driver iss_driver = {
.probe = iss_probe, .probe = iss_probe,
.remove_new = iss_remove, .remove = iss_remove,
.id_table = omap4iss_id_table, .id_table = omap4iss_id_table,
.driver = { .driver = {
.name = "omap4iss", .name = "omap4iss",

View File

@ -1103,7 +1103,7 @@ static const struct dev_pm_ops rkvdec_pm_ops = {
static struct platform_driver rkvdec_driver = { static struct platform_driver rkvdec_driver = {
.probe = rkvdec_probe, .probe = rkvdec_probe,
.remove_new = rkvdec_remove, .remove = rkvdec_remove,
.driver = { .driver = {
.name = "rkvdec", .name = "rkvdec",
.of_match_table = of_rkvdec_match, .of_match_table = of_rkvdec_match,

View File

@ -422,7 +422,7 @@ static const struct dev_pm_ops stfcamss_pm_ops = {
static struct platform_driver stfcamss_driver = { static struct platform_driver stfcamss_driver = {
.probe = stfcamss_probe, .probe = stfcamss_probe,
.remove_new = stfcamss_remove, .remove = stfcamss_remove,
.driver = { .driver = {
.name = "starfive-camss", .name = "starfive-camss",
.pm = &stfcamss_pm_ops, .pm = &stfcamss_pm_ops,

View File

@ -705,7 +705,7 @@ static const struct dev_pm_ops cedrus_dev_pm_ops = {
static struct platform_driver cedrus_driver = { static struct platform_driver cedrus_driver = {
.probe = cedrus_probe, .probe = cedrus_probe,
.remove_new = cedrus_remove, .remove = cedrus_remove,
.driver = { .driver = {
.name = CEDRUS_NAME, .name = CEDRUS_NAME,
.of_match_table = cedrus_dt_match, .of_match_table = cedrus_dt_match,

View File

@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match);
static struct platform_driver sun6i_isp_platform_driver = { static struct platform_driver sun6i_isp_platform_driver = {
.probe = sun6i_isp_probe, .probe = sun6i_isp_probe,
.remove_new = sun6i_isp_remove, .remove = sun6i_isp_remove,
.driver = { .driver = {
.name = SUN6I_ISP_NAME, .name = SUN6I_ISP_NAME,
.of_match_table = sun6i_isp_of_match, .of_match_table = sun6i_isp_of_match,

View File

@ -858,5 +858,5 @@ struct platform_driver tegra_csi_driver = {
.pm = &tegra_csi_pm_ops, .pm = &tegra_csi_pm_ops,
}, },
.probe = tegra_csi_probe, .probe = tegra_csi_probe,
.remove_new = tegra_csi_remove, .remove = tegra_csi_remove,
}; };

View File

@ -1979,5 +1979,5 @@ struct platform_driver tegra_vi_driver = {
.pm = &tegra_vi_pm_ops, .pm = &tegra_vi_pm_ops,
}, },
.probe = tegra_vi_probe, .probe = tegra_vi_probe,
.remove_new = tegra_vi_remove, .remove = tegra_vi_remove,
}; };

View File

@ -281,5 +281,5 @@ struct platform_driver tegra_vip_driver = {
.of_match_table = tegra_vip_of_id_table, .of_match_table = tegra_vip_of_id_table,
}, },
.probe = tegra_vip_probe, .probe = tegra_vip_probe,
.remove_new = tegra_vip_remove, .remove = tegra_vip_remove,
}; };

View File

@ -1090,7 +1090,7 @@ MODULE_DEVICE_TABLE(of, dim2_of_match);
static struct platform_driver dim2_driver = { static struct platform_driver dim2_driver = {
.probe = dim2_probe, .probe = dim2_probe,
.remove_new = dim2_remove, .remove = dim2_remove,
.driver = { .driver = {
.name = "hdm_dim2", .name = "hdm_dim2",
.of_match_table = dim2_of_match, .of_match_table = dim2_of_match,

View File

@ -952,7 +952,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
static struct platform_driver nvec_device_driver = { static struct platform_driver nvec_device_driver = {
.probe = tegra_nvec_probe, .probe = tegra_nvec_probe,
.remove_new = tegra_nvec_remove, .remove = tegra_nvec_remove,
.driver = { .driver = {
.name = "nvec", .name = "nvec",
.pm = &nvec_pm_ops, .pm = &nvec_pm_ops,

View File

@ -175,7 +175,7 @@ static void nvec_kbd_remove(struct platform_device *pdev)
static struct platform_driver nvec_kbd_driver = { static struct platform_driver nvec_kbd_driver = {
.probe = nvec_kbd_probe, .probe = nvec_kbd_probe,
.remove_new = nvec_kbd_remove, .remove = nvec_kbd_remove,
.driver = { .driver = {
.name = "nvec-kbd", .name = "nvec-kbd",
}, },

View File

@ -433,7 +433,7 @@ static void nvec_power_remove(struct platform_device *pdev)
static struct platform_driver nvec_power_driver = { static struct platform_driver nvec_power_driver = {
.probe = nvec_power_probe, .probe = nvec_power_probe,
.remove_new = nvec_power_remove, .remove = nvec_power_remove,
.driver = { .driver = {
.name = "nvec-power", .name = "nvec-power",
} }

View File

@ -175,7 +175,7 @@ static SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend,
static struct platform_driver nvec_mouse_driver = { static struct platform_driver nvec_mouse_driver = {
.probe = nvec_mouse_probe, .probe = nvec_mouse_probe,
.remove_new = nvec_mouse_remove, .remove = nvec_mouse_remove,
.driver = { .driver = {
.name = "nvec-mouse", .name = "nvec-mouse",
.pm = &nvec_mouse_pm_ops, .pm = &nvec_mouse_pm_ops,

View File

@ -977,7 +977,7 @@ MODULE_DEVICE_TABLE(of, cvm_oct_match);
static struct platform_driver cvm_oct_driver = { static struct platform_driver cvm_oct_driver = {
.probe = cvm_oct_probe, .probe = cvm_oct_probe,
.remove_new = cvm_oct_remove, .remove = cvm_oct_remove,
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.of_match_table = cvm_oct_match, .of_match_table = cvm_oct_match,

View File

@ -1799,7 +1799,7 @@ static struct platform_driver vchiq_driver = {
.of_match_table = vchiq_of_match, .of_match_table = vchiq_of_match,
}, },
.probe = vchiq_probe, .probe = vchiq_probe,
.remove_new = vchiq_remove, .remove = vchiq_remove,
}; };
static int __init vchiq_driver_init(void) static int __init vchiq_driver_init(void)