firmware: 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/firmware 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 <[email protected]>
Link: https://lore.kernel.org/r/36974feb6035201d53384557259ec72fe311053b.1731397962.git.u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index a477b5ade38dcac8517beeee7ff2908da9ea1d8f..dab1f4a545bd18527004988933f2be9d6f7faf0b 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -3321,7 +3321,7 @@ static struct platform_driver scmi_driver = {
                   .dev_groups = versions_groups,
                   },
        .probe = scmi_probe,
-       .remove_new = scmi_remove,
+       .remove = scmi_remove,
 };
 
 static struct dentry *scmi_debugfs_init(void)

diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index 94a6b4e667de140d7dc72245c346df2ae43c4bd2..9281137810c3123c58b4562caf4097895ea209ae 100644 (file)
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -1046,7 +1046,7 @@ static struct platform_driver scpi_driver = {
                .dev_groups = versions_groups,
        },
        .probe = scpi_probe,
-       .remove_new = scpi_remove,
+       .remove = scpi_remove,
 };
 module_platform_driver(scpi_driver);
 

diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c
index 208652a8087cd2463f8b52e155e4fbb96f484944..882db32e51be975a5304cf364feb281578f78627 100644 (file)
--- a/drivers/firmware/google/coreboot_table.c
+++ b/drivers/firmware/google/coreboot_table.c
@@ -220,7 +220,7 @@ MODULE_DEVICE_TABLE(of, coreboot_of_match);
 
 static struct platform_driver coreboot_table_driver = {
        .probe = coreboot_table_probe,
-       .remove_new = coreboot_table_remove,
+       .remove = coreboot_table_remove,
        .driver = {
                .name = "coreboot_table",
                .acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match),

diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c
index 01c8ef14eaec3fa54ebd6ba6e032b37727228db7..ed79e823157afbdbda17e5a5a903312009c119e6 100644 (file)
--- a/drivers/firmware/imx/imx-dsp.c
+++ b/drivers/firmware/imx/imx-dsp.c
@@ -180,7 +180,7 @@ static struct platform_driver imx_dsp_driver = {
                .name = "imx-dsp",
        },
        .probe = imx_dsp_probe,
-       .remove_new = imx_dsp_remove,
+       .remove = imx_dsp_remove,
 };
 builtin_platform_driver(imx_dsp_driver);
 

diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 9ca5ee58edbdf8922a30f2ddbc48baf8d6e74945..6c29d7726aa881b34a15e4a69f1ecd72a7be869d 100644 (file)
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -486,7 +486,7 @@ static struct platform_driver mpfs_auto_update_driver = {
                .name = "mpfs-auto-update",
        },
        .probe = mpfs_auto_update_probe,
-       .remove_new = mpfs_auto_update_remove,
+       .remove = mpfs_auto_update_remove,
 };
 module_platform_driver(mpfs_auto_update_driver);
 

diff --git a/drivers/firmware/mtk-adsp-ipc.c b/drivers/firmware/mtk-adsp-ipc.c
index fdb083f42ebf389ef8a861abad94557913810ed0..2b79371c61c9bfcace42d24b0cede1b04e1abb34 100644 (file)
--- a/drivers/firmware/mtk-adsp-ipc.c
+++ b/drivers/firmware/mtk-adsp-ipc.c
@@ -132,7 +132,7 @@ static struct platform_driver mtk_adsp_ipc_driver = {
                .name = "mtk-adsp-ipc",
        },
        .probe = mtk_adsp_ipc_probe,
-       .remove_new = mtk_adsp_ipc_remove,
+       .remove = mtk_adsp_ipc_remove,
 };
 builtin_platform_driver(mtk_adsp_ipc_driver);
 

diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index 85c525745b311fd0b8518b36742b8a72f58dcd2b..d58da3e4500a5e230b7da9a75e4d70df7c38c542 100644 (file)
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -757,7 +757,7 @@ MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match);
 
 static struct platform_driver fw_cfg_sysfs_driver = {
        .probe = fw_cfg_sysfs_probe,
-       .remove_new = fw_cfg_sysfs_remove,
+       .remove = fw_cfg_sysfs_remove,
        .driver = {
                .name = "fw_cfg",
                .of_match_table = fw_cfg_sysfs_mmio_match,

diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
index 18cc34987108537c1d39d81ff8866b52d0bee5b3..7ecde6921a0ac2992bd40aca24fdc7825a3ebba3 100644 (file)
--- a/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@ -406,7 +406,7 @@ static struct platform_driver rpi_firmware_driver = {
        },
        .probe          = rpi_firmware_probe,
        .shutdown       = rpi_firmware_shutdown,
-       .remove_new     = rpi_firmware_remove,
+       .remove         = rpi_firmware_remove,
 };
 module_platform_driver(rpi_firmware_driver);
 

diff --git a/drivers/firmware/stratix10-rsu.c b/drivers/firmware/stratix10-rsu.c
index e20cee9c2d320abaa81be38d6eb0c257ebaf3486..1ea39a0a76c787c6396300734b636b4b3a0ae04d 100644 (file)
--- a/drivers/firmware/stratix10-rsu.c
+++ b/drivers/firmware/stratix10-rsu.c
@@ -802,7 +802,7 @@ static void stratix10_rsu_remove(struct platform_device *pdev)
 
 static struct platform_driver stratix10_rsu_driver = {
        .probe = stratix10_rsu_probe,
-       .remove_new = stratix10_rsu_remove,
+       .remove = stratix10_rsu_remove,
        .driver = {
                .name = "stratix10-rsu",
                .dev_groups = rsu_groups,

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 528f37417aea48532003125cb8eacebff312e160..c5c78b869561b0c1e9602823ad1f501e98e3ce51 100644 (file)
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1271,7 +1271,7 @@ static void stratix10_svc_drv_remove(struct platform_device *pdev)
 
 static struct platform_driver stratix10_svc_driver = {
        .probe = stratix10_svc_drv_probe,
-       .remove_new = stratix10_svc_drv_remove,
+       .remove = stratix10_svc_drv_remove,
        .driver = {
                .name = "stratix10-svc",
                .of_match_table = stratix10_svc_drv_match,

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index add8acf66a9c7c9e9ecc39650a1aa1a1371fecf7..63d319f4d2975a7626c316e1b0c45dcd37318246 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -1983,6 +1983,6 @@ static struct platform_driver zynqmp_firmware_driver = {
                .dev_groups = zynqmp_firmware_groups,
        },
        .probe = zynqmp_firmware_probe,
-       .remove_new = zynqmp_firmware_remove,
+       .remove = zynqmp_firmware_remove,
 };
 module_platform_driver(zynqmp_firmware_driver);