Merge tag 'loongarch-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...

[linux-block.git] / drivers / clk / clk-s2mps11.c

diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index a3e883a9f4067191f0f97071516fdb0b6a3bbf81..38c456540d1b98cca0fc0370c185b03b497fd3ca 100644 (file)
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -202,7 +202,7 @@ err_reg:
        return ret;
 }
 
-static int s2mps11_clk_remove(struct platform_device *pdev)
+static void s2mps11_clk_remove(struct platform_device *pdev)
 {
        struct s2mps11_clk *s2mps11_clks = platform_get_drvdata(pdev);
        int i;
@@ -217,8 +217,6 @@ static int s2mps11_clk_remove(struct platform_device *pdev)
                        continue;
                clkdev_drop(s2mps11_clks[i].lookup);
        }
-
-       return 0;
 }
 
 static const struct platform_device_id s2mps11_clk_id[] = {
@@ -265,7 +263,7 @@ static struct platform_driver s2mps11_clk_driver = {
                .name  = "s2mps11-clk",
        },
        .probe = s2mps11_clk_probe,
-       .remove = s2mps11_clk_remove,
+       .remove_new = s2mps11_clk_remove,
        .id_table = s2mps11_clk_id,
 };
 module_platform_driver(s2mps11_clk_driver);