clk: mediatek: Make mtk_clk_pdev_remove() return void

This function returns 0 unconditionally. Make it return no value instead
and convert the drivers making use of it to platform_driver's
.remove_new().

This makes the semantics in the callers of mtk_clk_simple_remove() clearer
and prepares for the quest to make platform driver's remove function return
void. There is no semantic change.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230430190233.878921-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mediatek/clk-mt2701-mm.c b/drivers/clk/mediatek/clk-mt2701-mm.c
index c62c56fd2b7ec80da982c581f93802975e18de88..2b990b5a0422a41b4263b54e361f531542c740df 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701-mm.c
+++ b/drivers/clk/mediatek/clk-mt2701-mm.c
@@ -80,7 +80,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt2701_mm_id_table);
 
 static struct platform_driver clk_mt2701_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt2701-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c
index 204a3eae08dc5c26225a16bfad2c85472bf2322c..15cb61fe2d2f47f6bd0bcee2f5425d81aff34a97 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2712-mm.c
+++ b/drivers/clk/mediatek/clk-mt2712-mm.c
@@ -121,7 +121,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt2712_mm_id_table);
 
 static struct platform_driver clk_mt2712_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt2712-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt6779-mm.c b/drivers/clk/mediatek/clk-mt6779-mm.c
index c2f700ae6c2c82be110339310ec94134610fcf2d..5e17e441f6797b8f6f9f5f554d40feedb437ad87 100644 (file)
--- a/drivers/clk/mediatek/clk-mt6779-mm.c
+++ b/drivers/clk/mediatek/clk-mt6779-mm.c
@@ -98,7 +98,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt6779_mm_id_table);
 
 static struct platform_driver clk_mt6779_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt6779-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt6795-mm.c b/drivers/clk/mediatek/clk-mt6795-mm.c
index 8acc9cad2875b67de1cc0f8cad74c2aa03df461f..ced6e310d694c7a660f9417aaea4c80c8a7a6445 100644 (file)
--- a/drivers/clk/mediatek/clk-mt6795-mm.c
+++ b/drivers/clk/mediatek/clk-mt6795-mm.c
@@ -93,7 +93,7 @@ static struct platform_driver clk_mt6795_mm_drv = {
        },
        .id_table = clk_mt6795_mm_id_table,
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
 };
 module_platform_driver(clk_mt6795_mm_drv);
 

diff --git a/drivers/clk/mediatek/clk-mt6797-mm.c b/drivers/clk/mediatek/clk-mt6797-mm.c
index caacfa40a5bc37c31f7414a26e7deee82398d61e..5b0a77530b62e0d258799e2135261b9be008ccec 100644 (file)
--- a/drivers/clk/mediatek/clk-mt6797-mm.c
+++ b/drivers/clk/mediatek/clk-mt6797-mm.c
@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt6797_mm_id_table);
 
 static struct platform_driver clk_mt6797_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt6797-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt8167-mm.c b/drivers/clk/mediatek/clk-mt8167-mm.c
index 4e053c61315dab2f7a249245216c76d1c0fa7c8e..6472e76567a537d499fdd8a2b9e25d8c5a940cf5 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8167-mm.c
+++ b/drivers/clk/mediatek/clk-mt8167-mm.c
@@ -87,7 +87,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8167_mm_id_table);
 
 static struct platform_driver clk_mt8167_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8167-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt8173-mm.c b/drivers/clk/mediatek/clk-mt8173-mm.c
index 18e466dbf610645a8e2402539b9957297c6e6be7..ffed6c5bfde2d692bf2e949ea3c706693e06d902 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8173-mm.c
+++ b/drivers/clk/mediatek/clk-mt8173-mm.c
@@ -106,7 +106,7 @@ static struct platform_driver clk_mt8173_mm_drv = {
        },
        .id_table = clk_mt8173_mm_id_table,
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
 };
 module_platform_driver(clk_mt8173_mm_drv);
 

diff --git a/drivers/clk/mediatek/clk-mt8183-mm.c b/drivers/clk/mediatek/clk-mt8183-mm.c
index 2f99828bff1b31c72fb1935b8cffcb0705454c92..8aaddcfee5683b9ccf9900a2281c4ca11fecb32b 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8183-mm.c
+++ b/drivers/clk/mediatek/clk-mt8183-mm.c
@@ -95,7 +95,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8183_mm_id_table);
 
 static struct platform_driver clk_mt8183_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8183-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt8186-mm.c b/drivers/clk/mediatek/clk-mt8186-mm.c
index fc3bb6d1f7148411957ed0600d08bc55a011ced0..44ed504a80695a60a73e35a914421287d11b0084 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8186-mm.c
+++ b/drivers/clk/mediatek/clk-mt8186-mm.c
@@ -71,7 +71,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8186_mm_id_table);
 
 static struct platform_driver clk_mt8186_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8186-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt8188-vdo0.c b/drivers/clk/mediatek/clk-mt8188-vdo0.c
index d2be44c2f3f5806cf4b0e8c9e90fe9ecd0f946e1..d252e198678c2f3749db239cecc206d614727904 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8188-vdo0.c
+++ b/drivers/clk/mediatek/clk-mt8188-vdo0.c
@@ -97,7 +97,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8188_vdo0_id_table);
 
 static struct platform_driver clk_mt8188_vdo0_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8188-vdo0",
        },

diff --git a/drivers/clk/mediatek/clk-mt8188-vdo1.c b/drivers/clk/mediatek/clk-mt8188-vdo1.c
index 2ef8cae2e16ed8d87f8c6880340bbf3dc7a71b15..7b72d54086db3789ff5c0130fa3f84ff97d84445 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8188-vdo1.c
+++ b/drivers/clk/mediatek/clk-mt8188-vdo1.c
@@ -144,7 +144,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8188_vdo1_id_table);
 
 static struct platform_driver clk_mt8188_vdo1_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8188-vdo1",
        },

diff --git a/drivers/clk/mediatek/clk-mt8188-vpp0.c b/drivers/clk/mediatek/clk-mt8188-vpp0.c
index 07bdedf6a21ac4a27372fb3470e654687e81a59c..e7b02b26fefbc0f49095c7425113d4385d8dad84 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8188-vpp0.c
+++ b/drivers/clk/mediatek/clk-mt8188-vpp0.c
@@ -104,7 +104,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp0_id_table);
 
 static struct platform_driver clk_mt8188_vpp0_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8188-vpp0",
        },

diff --git a/drivers/clk/mediatek/clk-mt8188-vpp1.c b/drivers/clk/mediatek/clk-mt8188-vpp1.c
index d4e66b2405733d9819d8f575753f4de5107d1dd9..e8f0f7eca097b5788b1db399e82a4e70b5762418 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8188-vpp1.c
+++ b/drivers/clk/mediatek/clk-mt8188-vpp1.c
@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table);
 
 static struct platform_driver clk_mt8188_vpp1_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8188-vpp1",
        },

diff --git a/drivers/clk/mediatek/clk-mt8192-mm.c b/drivers/clk/mediatek/clk-mt8192-mm.c
index 47335d5177141c0186f64ee54a876f3816ff8e9f..b294184c518341ded681b9832c3377fd08bdb41c 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8192-mm.c
+++ b/drivers/clk/mediatek/clk-mt8192-mm.c
@@ -93,7 +93,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8192_mm_id_table);
 
 static struct platform_driver clk_mt8192_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8192-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mt8195-vdo0.c b/drivers/clk/mediatek/clk-mt8195-vdo0.c
index 509780750e43c31dc5922bce5afa7fad2d491f47..34fc318c146c33426f5c23c7ca13e52a5953cb20 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vdo0.c
+++ b/drivers/clk/mediatek/clk-mt8195-vdo0.c
@@ -106,7 +106,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8195_vdo0_id_table);
 
 static struct platform_driver clk_mt8195_vdo0_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8195-vdo0",
        },

diff --git a/drivers/clk/mediatek/clk-mt8195-vdo1.c b/drivers/clk/mediatek/clk-mt8195-vdo1.c
index 0a5214a1ed256f4c5cb979cd96b6c263647378e2..e400631e1dbeac78943562cc6077c1fe83c0d004 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vdo1.c
+++ b/drivers/clk/mediatek/clk-mt8195-vdo1.c
@@ -133,7 +133,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8195_vdo1_id_table);
 
 static struct platform_driver clk_mt8195_vdo1_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8195-vdo1",
        },

diff --git a/drivers/clk/mediatek/clk-mt8195-vpp0.c b/drivers/clk/mediatek/clk-mt8195-vpp0.c
index 1a98fb9a25e8a3274a87448ae09990aa2525175a..81725fcb3a7222f28399a567296449e6c3453b8c 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vpp0.c
+++ b/drivers/clk/mediatek/clk-mt8195-vpp0.c
@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8195_vpp0_id_table);
 
 static struct platform_driver clk_mt8195_vpp0_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8195-vpp0",
        },

diff --git a/drivers/clk/mediatek/clk-mt8195-vpp1.c b/drivers/clk/mediatek/clk-mt8195-vpp1.c
index c2d5b582f53a6d29b27ee9b99f88fa7cdfb0e505..867fde4e575b5e9a3a67db0ba58ed45cd3191541 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vpp1.c
+++ b/drivers/clk/mediatek/clk-mt8195-vpp1.c
@@ -97,7 +97,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8195_vpp1_id_table);
 
 static struct platform_driver clk_mt8195_vpp1_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8195-vpp1",
        },

diff --git a/drivers/clk/mediatek/clk-mt8365-mm.c b/drivers/clk/mediatek/clk-mt8365-mm.c
index 44427120846f01b06cb578f010e1ce512c4d95da..01a2ef8f594ef5aa6b7e0448ca9f5304c3ef7be5 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8365-mm.c
+++ b/drivers/clk/mediatek/clk-mt8365-mm.c
@@ -85,7 +85,7 @@ MODULE_DEVICE_TABLE(platform, clk_mt8365_mm_id_table);
 
 static struct platform_driver clk_mt8365_mm_drv = {
        .probe = mtk_clk_pdev_probe,
-       .remove = mtk_clk_pdev_remove,
+       .remove_new = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8365-mm",
        },

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 4816da9c6da40befcde3573c6bed996525e7d41c..cf3514c8e97e96db004077ba428fa1553d3eb0f5 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -648,14 +648,12 @@ int mtk_clk_simple_probe(struct platform_device *pdev)
 }
 EXPORT_SYMBOL_GPL(mtk_clk_simple_probe);
 
-int mtk_clk_pdev_remove(struct platform_device *pdev)
+void mtk_clk_pdev_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *node = dev->parent->of_node;
 
        __mtk_clk_simple_remove(pdev, node);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(mtk_clk_pdev_remove);
 

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index cc8070a133a470a2386ced0d0e7f3f40afbcab5c..22096501a60a7b801ec1951a95b128f007417279 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -240,7 +240,7 @@ struct mtk_clk_desc {
 };
 
 int mtk_clk_pdev_probe(struct platform_device *pdev);
-int mtk_clk_pdev_remove(struct platform_device *pdev);
+void mtk_clk_pdev_remove(struct platform_device *pdev);
 int mtk_clk_simple_probe(struct platform_device *pdev);
 void mtk_clk_simple_remove(struct platform_device *pdev);