Skip to content

Commit

Permalink
mailbox: Switch back to struct platform_driver::remove()
Browse files Browse the repository at this point in the history
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/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>
  • Loading branch information
Uwe Kleine-König authored and Jassi Brar committed Nov 24, 2024
1 parent e526735 commit 81f939d
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/mailbox/bcm-flexrm-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ static struct platform_driver flexrm_mbox_driver = {
.of_match_table = flexrm_mbox_of_match,
},
.probe = flexrm_mbox_probe,
.remove_new = flexrm_mbox_remove,
.remove = flexrm_mbox_remove,
};
module_platform_driver(flexrm_mbox_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/bcm-pdc-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,7 @@ static void pdc_remove(struct platform_device *pdev)

static struct platform_driver pdc_mbox_driver = {
.probe = pdc_probe,
.remove_new = pdc_remove,
.remove = pdc_remove,
.driver = {
.name = "brcm-iproc-pdc-mbox",
.of_match_table = pdc_mbox_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/imx-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ static const struct dev_pm_ops imx_mu_pm_ops = {

static struct platform_driver imx_mu_driver = {
.probe = imx_mu_probe,
.remove_new = imx_mu_remove,
.remove = imx_mu_remove,
.driver = {
.name = "imx_mu",
.of_match_table = imx_mu_dt_ids,
Expand Down
4 changes: 2 additions & 2 deletions drivers/mailbox/mailbox-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ static struct platform_driver mbox_test_driver = {
.name = "mailbox_test",
.of_match_table = mbox_test_match,
},
.probe = mbox_test_probe,
.remove_new = mbox_test_remove,
.probe = mbox_test_probe,
.remove = mbox_test_remove,
};
module_platform_driver(mbox_test_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/mtk-cmdq-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ MODULE_DEVICE_TABLE(of, cmdq_of_ids);

static struct platform_driver cmdq_drv = {
.probe = cmdq_probe,
.remove_new = cmdq_remove,
.remove = cmdq_remove,
.driver = {
.name = "mtk_cmdq",
.pm = &cmdq_pm_ops,
Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/qcom-apcs-ipc-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);

static struct platform_driver qcom_apcs_ipc_driver = {
.probe = qcom_apcs_ipc_probe,
.remove_new = qcom_apcs_ipc_remove,
.remove = qcom_apcs_ipc_remove,
.driver = {
.name = "qcom_apcs_ipc",
.of_match_table = qcom_apcs_ipc_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/qcom-ipcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = {

static struct platform_driver qcom_ipcc_driver = {
.probe = qcom_ipcc_probe,
.remove_new = qcom_ipcc_remove,
.remove = qcom_ipcc_remove,
.driver = {
.name = "qcom-ipcc",
.of_match_table = qcom_ipcc_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/stm32-ipcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ static struct platform_driver stm32_ipcc_driver = {
.of_match_table = stm32_ipcc_of_match,
},
.probe = stm32_ipcc_probe,
.remove_new = stm32_ipcc_remove,
.remove = stm32_ipcc_remove,
};

module_platform_driver(stm32_ipcc_driver);
Expand Down
4 changes: 2 additions & 2 deletions drivers/mailbox/sun6i-msgbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ static struct platform_driver sun6i_msgbox_driver = {
.name = "sun6i-msgbox",
.of_match_table = sun6i_msgbox_of_match,
},
.probe = sun6i_msgbox_probe,
.remove_new = sun6i_msgbox_remove,
.probe = sun6i_msgbox_probe,
.remove = sun6i_msgbox_remove,
};
module_platform_driver(sun6i_msgbox_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/tegra-hsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ static struct platform_driver tegra_hsp_driver = {
.pm = &tegra_hsp_pm_ops,
},
.probe = tegra_hsp_probe,
.remove_new = tegra_hsp_remove,
.remove = tegra_hsp_remove,
};

static int __init tegra_hsp_init(void)
Expand Down
2 changes: 1 addition & 1 deletion drivers/mailbox/zynqmp-ipi-mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ MODULE_DEVICE_TABLE(of, zynqmp_ipi_of_match);

static struct platform_driver zynqmp_ipi_driver = {
.probe = zynqmp_ipi_probe,
.remove_new = zynqmp_ipi_remove,
.remove = zynqmp_ipi_remove,
.driver = {
.name = "zynqmp-ipi",
.of_match_table = of_match_ptr(zynqmp_ipi_of_match),
Expand Down

0 comments on commit 81f939d

Please sign in to comment.