Merge tag 'ceph-for-6.4-rc1' of https://github.com/ceph/ceph-client

[linux-block.git] / drivers / clk / clk-fixed-mmio.c

diff --git a/drivers/clk/clk-fixed-mmio.c b/drivers/clk/clk-fixed-mmio.c
index 8609fca29cc4e08ddd49066392acf563bc95891e..0e08cb22c196a9ed268aa11f958e7a3865e6e394 100644 (file)
--- a/drivers/clk/clk-fixed-mmio.c
+++ b/drivers/clk/clk-fixed-mmio.c
@@ -71,14 +71,12 @@ static int of_fixed_mmio_clk_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int of_fixed_mmio_clk_remove(struct platform_device *pdev)
+static void of_fixed_mmio_clk_remove(struct platform_device *pdev)
 {
        struct clk_hw *clk = platform_get_drvdata(pdev);
 
        of_clk_del_provider(pdev->dev.of_node);
        clk_hw_unregister_fixed_rate(clk);
-
-       return 0;
 }
 
 static const struct of_device_id of_fixed_mmio_clk_ids[] = {
@@ -93,7 +91,7 @@ static struct platform_driver of_fixed_mmio_clk_driver = {
                .of_match_table = of_fixed_mmio_clk_ids,
        },
        .probe = of_fixed_mmio_clk_probe,
-       .remove = of_fixed_mmio_clk_remove,
+       .remove_new = of_fixed_mmio_clk_remove,
 };
 module_platform_driver(of_fixed_mmio_clk_driver);