Commit 81f939db authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jassi Brar
Browse files

mailbox: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
parent e5267355

drivers/mailbox/bcm-flexrm-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mailbox/bcm-pdc-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/mailbox/imx-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/mailbox/mailbox-test.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static struct platform_driver mbox_test_driver = { 
		.of_match_table = mbox_test_match,

	},

	.probe = mbox_test_probe,

	.remove_new = mbox_test_remove,

	.remove = mbox_test_remove,

};

module_platform_driver(mbox_test_driver);

drivers/mailbox/mtk-cmdq-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -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,