Skip to content

Commit 61ca6ee

Browse files
Uwe Kleine-Königbebarino
authored andcommitted
clk: mediatek: Make mtk_clk_simple_remove() return void
__mtk_clk_simple_remove() and so also mtk_clk_simple_remove() return zero unconditionally. Make them 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent ac9a786 commit 61ca6ee

File tree

126 files changed

+139
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+139
-139
lines changed

drivers/clk/mediatek/clk-mt2701-aud.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ static int clk_mt2701_aud_probe(struct platform_device *pdev)
150150
return r;
151151
}
152152

153-
static int clk_mt2701_aud_remove(struct platform_device *pdev)
153+
static void clk_mt2701_aud_remove(struct platform_device *pdev)
154154
{
155155
of_platform_depopulate(&pdev->dev);
156-
return mtk_clk_simple_remove(pdev);
156+
mtk_clk_simple_remove(pdev);
157157
}
158158

159159
static struct platform_driver clk_mt2701_aud_drv = {
160160
.probe = clk_mt2701_aud_probe,
161-
.remove = clk_mt2701_aud_remove,
161+
.remove_new = clk_mt2701_aud_remove,
162162
.driver = {
163163
.name = "clk-mt2701-aud",
164164
.of_match_table = of_match_clk_mt2701_aud,

drivers/clk/mediatek/clk-mt2701-bdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_bdp);
9999

100100
static struct platform_driver clk_mt2701_bdp_drv = {
101101
.probe = mtk_clk_simple_probe,
102-
.remove = mtk_clk_simple_remove,
102+
.remove_new = mtk_clk_simple_remove,
103103
.driver = {
104104
.name = "clk-mt2701-bdp",
105105
.of_match_table = of_match_clk_mt2701_bdp,

drivers/clk/mediatek/clk-mt2701-eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_eth);
5353

5454
static struct platform_driver clk_mt2701_eth_drv = {
5555
.probe = mtk_clk_simple_probe,
56-
.remove = mtk_clk_simple_remove,
56+
.remove_new = mtk_clk_simple_remove,
5757
.driver = {
5858
.name = "clk-mt2701-eth",
5959
.of_match_table = of_match_clk_mt2701_eth,

drivers/clk/mediatek/clk-mt2701-g3d.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_g3d);
5252

5353
static struct platform_driver clk_mt2701_g3d_drv = {
5454
.probe = mtk_clk_simple_probe,
55-
.remove = mtk_clk_simple_remove,
55+
.remove_new = mtk_clk_simple_remove,
5656
.driver = {
5757
.name = "clk-mt2701-g3d",
5858
.of_match_table = of_match_clk_mt2701_g3d,

drivers/clk/mediatek/clk-mt2701-hif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_hif);
5050

5151
static struct platform_driver clk_mt2701_hif_drv = {
5252
.probe = mtk_clk_simple_probe,
53-
.remove = mtk_clk_simple_remove,
53+
.remove_new = mtk_clk_simple_remove,
5454
.driver = {
5555
.name = "clk-mt2701-hif",
5656
.of_match_table = of_match_clk_mt2701_hif,

drivers/clk/mediatek/clk-mt2701-img.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_img);
4747

4848
static struct platform_driver clk_mt2701_img_drv = {
4949
.probe = mtk_clk_simple_probe,
50-
.remove = mtk_clk_simple_remove,
50+
.remove_new = mtk_clk_simple_remove,
5151
.driver = {
5252
.name = "clk-mt2701-img",
5353
.of_match_table = of_match_clk_mt2701_img,

drivers/clk/mediatek/clk-mt2701-vdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2701_vdec);
5252

5353
static struct platform_driver clk_mt2701_vdec_drv = {
5454
.probe = mtk_clk_simple_probe,
55-
.remove = mtk_clk_simple_remove,
55+
.remove_new = mtk_clk_simple_remove,
5656
.driver = {
5757
.name = "clk-mt2701-vdec",
5858
.of_match_table = of_match_clk_mt2701_vdec,

drivers/clk/mediatek/clk-mt2712-bdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2712_bdp);
6969

7070
static struct platform_driver clk_mt2712_bdp_drv = {
7171
.probe = mtk_clk_simple_probe,
72-
.remove = mtk_clk_simple_remove,
72+
.remove_new = mtk_clk_simple_remove,
7373
.driver = {
7474
.name = "clk-mt2712-bdp",
7575
.of_match_table = of_match_clk_mt2712_bdp,

drivers/clk/mediatek/clk-mt2712-img.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2712_img);
4747

4848
static struct platform_driver clk_mt2712_img_drv = {
4949
.probe = mtk_clk_simple_probe,
50-
.remove = mtk_clk_simple_remove,
50+
.remove_new = mtk_clk_simple_remove,
5151
.driver = {
5252
.name = "clk-mt2712-img",
5353
.of_match_table = of_match_clk_mt2712_img,

drivers/clk/mediatek/clk-mt2712-jpgdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ MODULE_DEVICE_TABLE(of, of_match_clk_mt2712_jpgdec);
4343

4444
static struct platform_driver clk_mt2712_jpgdec_drv = {
4545
.probe = mtk_clk_simple_probe,
46-
.remove = mtk_clk_simple_remove,
46+
.remove_new = mtk_clk_simple_remove,
4747
.driver = {
4848
.name = "clk-mt2712-jpgdec",
4949
.of_match_table = of_match_clk_mt2712_jpgdec,

0 commit comments

Comments
 (0)