Commit 29c9e85d authored by Andi Shyti's avatar Andi Shyti Committed by Wolfram Sang

i2c: at91-core: Use devm_clk_get_enabled()

Replace the pair of functions, devm_clk_get() and
clk_prepare_enable(), with a single function
devm_clk_get_enabled().
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
[wsa: rebased]
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent ba63f993
...@@ -221,11 +221,10 @@ static int at91_twi_probe(struct platform_device *pdev) ...@@ -221,11 +221,10 @@ static int at91_twi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
dev->clk = devm_clk_get(dev->dev, NULL); dev->clk = devm_clk_get_enabled(dev->dev, NULL);
if (IS_ERR(dev->clk)) if (IS_ERR(dev->clk))
return dev_err_probe(dev->dev, PTR_ERR(dev->clk), "no clock defined\n"); return dev_err_probe(dev->dev, PTR_ERR(dev->clk),
"failed to enable clock\n");
clk_prepare_enable(dev->clk);
snprintf(dev->adapter.name, sizeof(dev->adapter.name), "AT91"); snprintf(dev->adapter.name, sizeof(dev->adapter.name), "AT91");
i2c_set_adapdata(&dev->adapter, dev); i2c_set_adapdata(&dev->adapter, dev);
...@@ -254,8 +253,6 @@ static int at91_twi_probe(struct platform_device *pdev) ...@@ -254,8 +253,6 @@ static int at91_twi_probe(struct platform_device *pdev)
rc = i2c_add_numbered_adapter(&dev->adapter); rc = i2c_add_numbered_adapter(&dev->adapter);
if (rc) { if (rc) {
clk_disable_unprepare(dev->clk);
pm_runtime_disable(dev->dev); pm_runtime_disable(dev->dev);
pm_runtime_set_suspended(dev->dev); pm_runtime_set_suspended(dev->dev);
...@@ -272,7 +269,6 @@ static void at91_twi_remove(struct platform_device *pdev) ...@@ -272,7 +269,6 @@ static void at91_twi_remove(struct platform_device *pdev)
struct at91_twi_dev *dev = platform_get_drvdata(pdev); struct at91_twi_dev *dev = platform_get_drvdata(pdev);
i2c_del_adapter(&dev->adapter); i2c_del_adapter(&dev->adapter);
clk_disable_unprepare(dev->clk);
pm_runtime_disable(dev->dev); pm_runtime_disable(dev->dev);
pm_runtime_set_suspended(dev->dev); pm_runtime_set_suspended(dev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment