Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[tomoyo/tomoyo-test1.git] / drivers / clk / hisilicon / clk-hi3559a.c

diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c
index 8036bd8..ce40281 100644 (file)
--- a/drivers/clk/hisilicon/clk-hi3559a.c
+++ b/drivers/clk/hisilicon/clk-hi3559a.c
@@ -810,18 +810,17 @@ static int hi3559av100_crg_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int hi3559av100_crg_remove(struct platform_device *pdev)
+static void hi3559av100_crg_remove(struct platform_device *pdev)
 {
        struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
        hisi_reset_exit(crg->rstc);
        crg->funcs->unregister_clks(pdev);
-       return 0;
 }
 
 static struct platform_driver hi3559av100_crg_driver = {
        .probe          = hi3559av100_crg_probe,
-       .remove         = hi3559av100_crg_remove,
+       .remove_new     = hi3559av100_crg_remove,
        .driver         = {
                .name   = "hi3559av100-clock",
                .of_match_table = hi3559av100_crg_match_table,