Skip to content

Commit 81f939d

Browse files
ukleinekJassi Brar
authored andcommitted
mailbox: 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/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>
1 parent e526735 commit 81f939d

11 files changed

+13
-13
lines changed

drivers/mailbox/bcm-flexrm-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ static struct platform_driver flexrm_mbox_driver = {
16751675
.of_match_table = flexrm_mbox_of_match,
16761676
},
16771677
.probe = flexrm_mbox_probe,
1678-
.remove_new = flexrm_mbox_remove,
1678+
.remove = flexrm_mbox_remove,
16791679
};
16801680
module_platform_driver(flexrm_mbox_driver);
16811681

drivers/mailbox/bcm-pdc-mailbox.c

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

16191619
static struct platform_driver pdc_mbox_driver = {
16201620
.probe = pdc_probe,
1621-
.remove_new = pdc_remove,
1621+
.remove = pdc_remove,
16221622
.driver = {
16231623
.name = "brcm-iproc-pdc-mbox",
16241624
.of_match_table = pdc_mbox_of_match,

drivers/mailbox/imx-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ static const struct dev_pm_ops imx_mu_pm_ops = {
11201120

11211121
static struct platform_driver imx_mu_driver = {
11221122
.probe = imx_mu_probe,
1123-
.remove_new = imx_mu_remove,
1123+
.remove = imx_mu_remove,
11241124
.driver = {
11251125
.name = "imx_mu",
11261126
.of_match_table = imx_mu_dt_ids,

drivers/mailbox/mailbox-test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ static struct platform_driver mbox_test_driver = {
441441
.name = "mailbox_test",
442442
.of_match_table = mbox_test_match,
443443
},
444-
.probe = mbox_test_probe,
445-
.remove_new = mbox_test_remove,
444+
.probe = mbox_test_probe,
445+
.remove = mbox_test_remove,
446446
};
447447
module_platform_driver(mbox_test_driver);
448448

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ MODULE_DEVICE_TABLE(of, cmdq_of_ids);
796796

797797
static struct platform_driver cmdq_drv = {
798798
.probe = cmdq_probe,
799-
.remove_new = cmdq_remove,
799+
.remove = cmdq_remove,
800800
.driver = {
801801
.name = "mtk_cmdq",
802802
.pm = &cmdq_pm_ops,

drivers/mailbox/qcom-apcs-ipc-mailbox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);
167167

168168
static struct platform_driver qcom_apcs_ipc_driver = {
169169
.probe = qcom_apcs_ipc_probe,
170-
.remove_new = qcom_apcs_ipc_remove,
170+
.remove = qcom_apcs_ipc_remove,
171171
.driver = {
172172
.name = "qcom_apcs_ipc",
173173
.of_match_table = qcom_apcs_ipc_of_match,

drivers/mailbox/qcom-ipcc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ static const struct dev_pm_ops qcom_ipcc_dev_pm_ops = {
346346

347347
static struct platform_driver qcom_ipcc_driver = {
348348
.probe = qcom_ipcc_probe,
349-
.remove_new = qcom_ipcc_remove,
349+
.remove = qcom_ipcc_remove,
350350
.driver = {
351351
.name = "qcom-ipcc",
352352
.of_match_table = qcom_ipcc_of_match,

drivers/mailbox/stm32-ipcc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static struct platform_driver stm32_ipcc_driver = {
379379
.of_match_table = stm32_ipcc_of_match,
380380
},
381381
.probe = stm32_ipcc_probe,
382-
.remove_new = stm32_ipcc_remove,
382+
.remove = stm32_ipcc_remove,
383383
};
384384

385385
module_platform_driver(stm32_ipcc_driver);

drivers/mailbox/sun6i-msgbox.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ static struct platform_driver sun6i_msgbox_driver = {
307307
.name = "sun6i-msgbox",
308308
.of_match_table = sun6i_msgbox_of_match,
309309
},
310-
.probe = sun6i_msgbox_probe,
311-
.remove_new = sun6i_msgbox_remove,
310+
.probe = sun6i_msgbox_probe,
311+
.remove = sun6i_msgbox_remove,
312312
};
313313
module_platform_driver(sun6i_msgbox_driver);
314314

drivers/mailbox/tegra-hsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ static struct platform_driver tegra_hsp_driver = {
951951
.pm = &tegra_hsp_pm_ops,
952952
},
953953
.probe = tegra_hsp_probe,
954-
.remove_new = tegra_hsp_remove,
954+
.remove = tegra_hsp_remove,
955955
};
956956

957957
static int __init tegra_hsp_init(void)

0 commit comments

Comments
 (0)