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

mailbox: 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/mailbox 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.

Make a few indentions consistent while touching these struct
initializers.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>

authored by

Uwe Kleine-König and committed by
Jassi Brar
81f939db e5267355

+13 -13
+1 -1
drivers/mailbox/bcm-flexrm-mailbox.c
··· 1675 1675 .of_match_table = flexrm_mbox_of_match, 1676 1676 }, 1677 1677 .probe = flexrm_mbox_probe, 1678 - .remove_new = flexrm_mbox_remove, 1678 + .remove = flexrm_mbox_remove, 1679 1679 }; 1680 1680 module_platform_driver(flexrm_mbox_driver); 1681 1681
+1 -1
drivers/mailbox/bcm-pdc-mailbox.c
··· 1618 1618 1619 1619 static struct platform_driver pdc_mbox_driver = { 1620 1620 .probe = pdc_probe, 1621 - .remove_new = pdc_remove, 1621 + .remove = pdc_remove, 1622 1622 .driver = { 1623 1623 .name = "brcm-iproc-pdc-mbox", 1624 1624 .of_match_table = pdc_mbox_of_match,
+1 -1
drivers/mailbox/imx-mailbox.c
··· 1120 1120 1121 1121 static struct platform_driver imx_mu_driver = { 1122 1122 .probe = imx_mu_probe, 1123 - .remove_new = imx_mu_remove, 1123 + .remove = imx_mu_remove, 1124 1124 .driver = { 1125 1125 .name = "imx_mu", 1126 1126 .of_match_table = imx_mu_dt_ids,
+2 -2
drivers/mailbox/mailbox-test.c
··· 441 441 .name = "mailbox_test", 442 442 .of_match_table = mbox_test_match, 443 443 }, 444 - .probe = mbox_test_probe, 445 - .remove_new = mbox_test_remove, 444 + .probe = mbox_test_probe, 445 + .remove = mbox_test_remove, 446 446 }; 447 447 module_platform_driver(mbox_test_driver); 448 448
+1 -1
drivers/mailbox/mtk-cmdq-mailbox.c
··· 796 796 797 797 static struct platform_driver cmdq_drv = { 798 798 .probe = cmdq_probe, 799 - .remove_new = cmdq_remove, 799 + .remove = cmdq_remove, 800 800 .driver = { 801 801 .name = "mtk_cmdq", 802 802 .pm = &cmdq_pm_ops,
+1 -1
drivers/mailbox/qcom-apcs-ipc-mailbox.c
··· 167 167 168 168 static struct platform_driver qcom_apcs_ipc_driver = { 169 169 .probe = qcom_apcs_ipc_probe, 170 - .remove_new = qcom_apcs_ipc_remove, 170 + .remove = qcom_apcs_ipc_remove, 171 171 .driver = { 172 172 .name = "qcom_apcs_ipc", 173 173 .of_match_table = qcom_apcs_ipc_of_match,
+1 -1
drivers/mailbox/qcom-ipcc.c
··· 346 346 347 347 static struct platform_driver qcom_ipcc_driver = { 348 348 .probe = qcom_ipcc_probe, 349 - .remove_new = qcom_ipcc_remove, 349 + .remove = qcom_ipcc_remove, 350 350 .driver = { 351 351 .name = "qcom-ipcc", 352 352 .of_match_table = qcom_ipcc_of_match,
+1 -1
drivers/mailbox/stm32-ipcc.c
··· 379 379 .of_match_table = stm32_ipcc_of_match, 380 380 }, 381 381 .probe = stm32_ipcc_probe, 382 - .remove_new = stm32_ipcc_remove, 382 + .remove = stm32_ipcc_remove, 383 383 }; 384 384 385 385 module_platform_driver(stm32_ipcc_driver);
+2 -2
drivers/mailbox/sun6i-msgbox.c
··· 307 307 .name = "sun6i-msgbox", 308 308 .of_match_table = sun6i_msgbox_of_match, 309 309 }, 310 - .probe = sun6i_msgbox_probe, 311 - .remove_new = sun6i_msgbox_remove, 310 + .probe = sun6i_msgbox_probe, 311 + .remove = sun6i_msgbox_remove, 312 312 }; 313 313 module_platform_driver(sun6i_msgbox_driver); 314 314
+1 -1
drivers/mailbox/tegra-hsp.c
··· 951 951 .pm = &tegra_hsp_pm_ops, 952 952 }, 953 953 .probe = tegra_hsp_probe, 954 - .remove_new = tegra_hsp_remove, 954 + .remove = tegra_hsp_remove, 955 955 }; 956 956 957 957 static int __init tegra_hsp_init(void)
+1 -1
drivers/mailbox/zynqmp-ipi-mailbox.c
··· 1015 1015 1016 1016 static struct platform_driver zynqmp_ipi_driver = { 1017 1017 .probe = zynqmp_ipi_probe, 1018 - .remove_new = zynqmp_ipi_remove, 1018 + .remove = zynqmp_ipi_remove, 1019 1019 .driver = { 1020 1020 .name = "zynqmp-ipi", 1021 1021 .of_match_table = of_match_ptr(zynqmp_ipi_of_match),