Skip to content

Commit 5770e9f

Browse files
ukleinekgregkh
authored andcommitted
firmware: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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>
1 parent 40e210a commit 5770e9f

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

drivers/firmware/arm_scmi/driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3321,7 +3321,7 @@ static struct platform_driver scmi_driver = {
33213321
.dev_groups = versions_groups,
33223322
},
33233323
.probe = scmi_probe,
3324-
.remove_new = scmi_remove,
3324+
.remove = scmi_remove,
33253325
};
33263326

33273327
static struct dentry *scmi_debugfs_init(void)

drivers/firmware/arm_scpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ static struct platform_driver scpi_driver = {
10461046
.dev_groups = versions_groups,
10471047
},
10481048
.probe = scpi_probe,
1049-
.remove_new = scpi_remove,
1049+
.remove = scpi_remove,
10501050
};
10511051
module_platform_driver(scpi_driver);
10521052

drivers/firmware/google/coreboot_table.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ MODULE_DEVICE_TABLE(of, coreboot_of_match);
220220

221221
static struct platform_driver coreboot_table_driver = {
222222
.probe = coreboot_table_probe,
223-
.remove_new = coreboot_table_remove,
223+
.remove = coreboot_table_remove,
224224
.driver = {
225225
.name = "coreboot_table",
226226
.acpi_match_table = ACPI_PTR(cros_coreboot_acpi_match),

drivers/firmware/imx/imx-dsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static struct platform_driver imx_dsp_driver = {
180180
.name = "imx-dsp",
181181
},
182182
.probe = imx_dsp_probe,
183-
.remove_new = imx_dsp_remove,
183+
.remove = imx_dsp_remove,
184184
};
185185
builtin_platform_driver(imx_dsp_driver);
186186

drivers/firmware/microchip/mpfs-auto-update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ static struct platform_driver mpfs_auto_update_driver = {
486486
.name = "mpfs-auto-update",
487487
},
488488
.probe = mpfs_auto_update_probe,
489-
.remove_new = mpfs_auto_update_remove,
489+
.remove = mpfs_auto_update_remove,
490490
};
491491
module_platform_driver(mpfs_auto_update_driver);
492492

drivers/firmware/mtk-adsp-ipc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static struct platform_driver mtk_adsp_ipc_driver = {
132132
.name = "mtk-adsp-ipc",
133133
},
134134
.probe = mtk_adsp_ipc_probe,
135-
.remove_new = mtk_adsp_ipc_remove,
135+
.remove = mtk_adsp_ipc_remove,
136136
};
137137
builtin_platform_driver(mtk_adsp_ipc_driver);
138138

drivers/firmware/qemu_fw_cfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match);
757757

758758
static struct platform_driver fw_cfg_sysfs_driver = {
759759
.probe = fw_cfg_sysfs_probe,
760-
.remove_new = fw_cfg_sysfs_remove,
760+
.remove = fw_cfg_sysfs_remove,
761761
.driver = {
762762
.name = "fw_cfg",
763763
.of_match_table = fw_cfg_sysfs_mmio_match,

drivers/firmware/raspberrypi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ static struct platform_driver rpi_firmware_driver = {
406406
},
407407
.probe = rpi_firmware_probe,
408408
.shutdown = rpi_firmware_shutdown,
409-
.remove_new = rpi_firmware_remove,
409+
.remove = rpi_firmware_remove,
410410
};
411411
module_platform_driver(rpi_firmware_driver);
412412

drivers/firmware/stratix10-rsu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ static void stratix10_rsu_remove(struct platform_device *pdev)
802802

803803
static struct platform_driver stratix10_rsu_driver = {
804804
.probe = stratix10_rsu_probe,
805-
.remove_new = stratix10_rsu_remove,
805+
.remove = stratix10_rsu_remove,
806806
.driver = {
807807
.name = "stratix10-rsu",
808808
.dev_groups = rsu_groups,

drivers/firmware/stratix10-svc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,7 @@ static void stratix10_svc_drv_remove(struct platform_device *pdev)
12711271

12721272
static struct platform_driver stratix10_svc_driver = {
12731273
.probe = stratix10_svc_drv_probe,
1274-
.remove_new = stratix10_svc_drv_remove,
1274+
.remove = stratix10_svc_drv_remove,
12751275
.driver = {
12761276
.name = "stratix10-svc",
12771277
.of_match_table = stratix10_svc_drv_match,

0 commit comments

Comments
 (0)