These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / clk-twl6040.c

diff --git a/kernel/drivers/clk/clk-twl6040.c b/kernel/drivers/clk/clk-twl6040.c
index 4a75513..8e5ed64 100644 (file)
--- a/kernel/drivers/clk/clk-twl6040.c
+++ b/kernel/drivers/clk/clk-twl6040.c
@@ -20,7 +20,6 @@
 *
 */
 
-#include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
@@ -91,7 +90,7 @@ static int twl6040_clk_probe(struct platform_device *pdev)
        clkdata->twl6040 = twl6040;
 
        clkdata->mcpdm_fclk.init = &wm831x_clkout_init;
-       clkdata->clk = clk_register(&pdev->dev, &clkdata->mcpdm_fclk);
+       clkdata->clk = devm_clk_register(&pdev->dev, &clkdata->mcpdm_fclk);
        if (IS_ERR(clkdata->clk))
                return PTR_ERR(clkdata->clk);
 
@@ -100,21 +99,11 @@ static int twl6040_clk_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int twl6040_clk_remove(struct platform_device *pdev)
-{
-       struct twl6040_clk *clkdata = platform_get_drvdata(pdev);
-
-       clk_unregister(clkdata->clk);
-
-       return 0;
-}
-
 static struct platform_driver twl6040_clk_driver = {
        .driver = {
                .name = "twl6040-clk",
        },
        .probe = twl6040_clk_probe,
-       .remove = twl6040_clk_remove,
 };
 
 module_platform_driver(twl6040_clk_driver);