Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Uwe Kleine-König and committed by
Greg Kroah-Hartman
5770e9f2 40e210a1

+11 -11
+1 -1
drivers/firmware/arm_scmi/driver.c
··· 3321 3321 .dev_groups = versions_groups, 3322 3322 }, 3323 3323 .probe = scmi_probe, 3324 - .remove_new = scmi_remove, 3324 + .remove = scmi_remove, 3325 3325 }; 3326 3326 3327 3327 static struct dentry *scmi_debugfs_init(void)
+1 -1
drivers/firmware/arm_scpi.c
··· 1046 1046 .dev_groups = versions_groups, 1047 1047 }, 1048 1048 .probe = scpi_probe, 1049 - .remove_new = scpi_remove, 1049 + .remove = scpi_remove, 1050 1050 }; 1051 1051 module_platform_driver(scpi_driver); 1052 1052
+1 -1
drivers/firmware/google/coreboot_table.c
··· 220 220 221 221 static struct platform_driver coreboot_table_driver = { 222 222 .probe = coreboot_table_probe, 223 - .remove_new = coreboot_table_remove, 223 + .remove = coreboot_table_remove, 224 224 .driver = { 225 225 .name = "coreboot_table", 226 226 .acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match),
+1 -1
drivers/firmware/imx/imx-dsp.c
··· 180 180 .name = "imx-dsp", 181 181 }, 182 182 .probe = imx_dsp_probe, 183 - .remove_new = imx_dsp_remove, 183 + .remove = imx_dsp_remove, 184 184 }; 185 185 builtin_platform_driver(imx_dsp_driver); 186 186
+1 -1
drivers/firmware/microchip/mpfs-auto-update.c
··· 486 486 .name = "mpfs-auto-update", 487 487 }, 488 488 .probe = mpfs_auto_update_probe, 489 - .remove_new = mpfs_auto_update_remove, 489 + .remove = mpfs_auto_update_remove, 490 490 }; 491 491 module_platform_driver(mpfs_auto_update_driver); 492 492
+1 -1
drivers/firmware/mtk-adsp-ipc.c
··· 132 132 .name = "mtk-adsp-ipc", 133 133 }, 134 134 .probe = mtk_adsp_ipc_probe, 135 - .remove_new = mtk_adsp_ipc_remove, 135 + .remove = mtk_adsp_ipc_remove, 136 136 }; 137 137 builtin_platform_driver(mtk_adsp_ipc_driver); 138 138
+1 -1
drivers/firmware/qemu_fw_cfg.c
··· 757 757 758 758 static struct platform_driver fw_cfg_sysfs_driver = { 759 759 .probe = fw_cfg_sysfs_probe, 760 - .remove_new = fw_cfg_sysfs_remove, 760 + .remove = fw_cfg_sysfs_remove, 761 761 .driver = { 762 762 .name = "fw_cfg", 763 763 .of_match_table = fw_cfg_sysfs_mmio_match,
+1 -1
drivers/firmware/raspberrypi.c
··· 406 406 }, 407 407 .probe = rpi_firmware_probe, 408 408 .shutdown = rpi_firmware_shutdown, 409 - .remove_new = rpi_firmware_remove, 409 + .remove = rpi_firmware_remove, 410 410 }; 411 411 module_platform_driver(rpi_firmware_driver); 412 412
+1 -1
drivers/firmware/stratix10-rsu.c
··· 802 802 803 803 static struct platform_driver stratix10_rsu_driver = { 804 804 .probe = stratix10_rsu_probe, 805 - .remove_new = stratix10_rsu_remove, 805 + .remove = stratix10_rsu_remove, 806 806 .driver = { 807 807 .name = "stratix10-rsu", 808 808 .dev_groups = rsu_groups,
+1 -1
drivers/firmware/stratix10-svc.c
··· 1271 1271 1272 1272 static struct platform_driver stratix10_svc_driver = { 1273 1273 .probe = stratix10_svc_drv_probe, 1274 - .remove_new = stratix10_svc_drv_remove, 1274 + .remove = stratix10_svc_drv_remove, 1275 1275 .driver = { 1276 1276 .name = "stratix10-svc", 1277 1277 .of_match_table = stratix10_svc_drv_match,
+1 -1
drivers/firmware/xilinx/zynqmp.c
··· 1983 1983 .dev_groups = zynqmp_firmware_groups, 1984 1984 }, 1985 1985 .probe = zynqmp_firmware_probe, 1986 - .remove_new = zynqmp_firmware_remove, 1986 + .remove = zynqmp_firmware_remove, 1987 1987 }; 1988 1988 module_platform_driver(zynqmp_firmware_driver);