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>

diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
index b1abc2a0c971a528a64d7d7aec1bcdfcc8822393..41f79e51d9e5a92089a3fd798e848d837fb2775a 100644 (file)
--- a/drivers/mailbox/bcm-flexrm-mailbox.c
+++ b/drivers/mailbox/bcm-flexrm-mailbox.c
@@ -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);
 

diff --git a/drivers/mailbox/bcm-pdc-mailbox.c b/drivers/mailbox/bcm-pdc-mailbox.c
index a873672a9082d29ce6d6c4e34e2695f279d24f29..406bc41cba604475535babaae4bbb56eb1191ee3 100644 (file)
--- a/drivers/mailbox/bcm-pdc-mailbox.c
+++ b/drivers/mailbox/bcm-pdc-mailbox.c
@@ -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,

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 3fe51b2de89ef08afe4546b6874c9501abfebea3..6ef8338add0d61bd0e746aaf0a37392fa462782d 100644 (file)
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -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,

diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c
index 3386b4e72551c78f292d3855f5fea8b210618deb..c9dd8c42c0cdf9e4ff96da012d7fbdcb4c6bc130 100644 (file)
--- a/drivers/mailbox/mailbox-test.c
+++ b/drivers/mailbox/mailbox-test.c
@@ -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);
 

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index 4324c53e372dfbc7c55c26545176cb20bc10fcfb..d186865b8dce64b5f719cd0f0a772ee822fd236f 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -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,

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 7d91e7c016ba7303e1ffb2c941b0733dd352c2f0..f0d1fc0fb9ffc927df07e527835580f0408d58c3 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -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,

diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c
index d537cc9c4d4be0a9733919bf81772e6be811324b..14c7907c66326f65224facc81fe5895f303f322d 100644 (file)
--- a/drivers/mailbox/qcom-ipcc.c
+++ b/drivers/mailbox/qcom-ipcc.c
@@ -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,

diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index 1442f275782bd5b66c28c1ceae2fac36b2354a13..4f63f1a14ca652fa9775f84bd2d2fd68bc8fff5a 100644 (file)
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -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);

diff --git a/drivers/mailbox/sun6i-msgbox.c b/drivers/mailbox/sun6i-msgbox.c
index 3dcc54dc83b2df326a851d589e57a3f5c9f99bdb..6ba6920f4645e7e110d802adb794f9d6123b487e 100644 (file)
--- a/drivers/mailbox/sun6i-msgbox.c
+++ b/drivers/mailbox/sun6i-msgbox.c
@@ -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);
 

diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index 19ef56cbcfd39da11760b81b49500f57e5d4e50e..8d5e2d7dc03b2fe075c7cd74c9a7e667db85a899 100644 (file)
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -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)

diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
index 815e0492f02962f1c1ac708510bd35239ed140a3..aa5249da59b2f566e53ae9f9e533ab29848ac388 100644 (file)
--- a/drivers/mailbox/zynqmp-ipi-mailbox.c
+++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -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),