Skip to contentSkip to conversation

clk: twl6040: Convert to use devm_clk_register

PATCH Superseded Axel Lin 2 participants 2 messages May 18, 2014 – May 19, 2014 Common clk

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 clk: twl6040: Convert to use devm_clk_register

Use devm_clk_register() to simplify the code by removing twl6040_clk_remove().

---
 drivers/clk/clk-twl6040.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/clk/clk-twl6040.c +1 -11
index 1ada79a..9e996b4 100644
@@ -91,7 +91,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,22 +100,12 @@ 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",
 		.owner = THIS_MODULE,
 	},
 	.probe = twl6040_clk_probe,
-	.remove = twl6040_clk_remove,
 };
 
 module_platform_driver(twl6040_clk_driver);
Signature · 1 line
1.8.3.2
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Axel Lin

Use devm_clk_register() to simplify the code by removing twl6040_clk_remove().

Quoted 43 lines
---
 drivers/clk/clk-twl6040.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/clk/clk-twl6040.c +1 -11
index 1ada79a..9e996b4 100644
@@ -91,7 +91,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,22 +100,12 @@ 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",
 		.owner = THIS_MODULE,
 	},
 	.probe = twl6040_clk_probe,
-	.remove = twl6040_clk_remove,
 };
 
 module_platform_driver(twl6040_clk_driver);
Signature · 1 line
Péter