niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

i2c: sun6i-p2wi: Use devm_clk_get_enabled()

Browse source 
Replace the pair of functions, devm_clk_get() and clk_prepare_enable(),
with a single function devm_clk_get_enabled().

Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Andi Shyti 2023-06-12 00:57:00 +02:00 • committed by Wolfram Sang
parent 9aaccc6565
commit 75ff8a340a
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/i2c/busses/i2c-sun6i-p2wi.c
View file

@ -239,15 +239,9 @@ static int p2wi_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
return irq; return irq;
p2wi->clk = devm_clk_get(dev, NULL); p2wi->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(p2wi->clk)) { if (IS_ERR(p2wi->clk)) {
ret = PTR_ERR(p2wi->clk); ret = PTR_ERR(p2wi->clk);
dev_err(dev, "failed to retrieve clk: %d\n", ret);
return ret;
}
ret = clk_prepare_enable(p2wi->clk);
if (ret) {
dev_err(dev, "failed to enable clk: %d\n", ret); dev_err(dev, "failed to enable clk: %d\n", ret);
return ret; return ret;
} }
@ -256,15 +250,14 @@ static int p2wi_probe(struct platform_device *pdev)
p2wi->rstc = devm_reset_control_get_exclusive(dev, NULL); p2wi->rstc = devm_reset_control_get_exclusive(dev, NULL);
if (IS_ERR(p2wi->rstc)) { if (IS_ERR(p2wi->rstc)) {
ret = PTR_ERR(p2wi->rstc);
dev_err(dev, "failed to retrieve reset controller: %d\n", ret); dev_err(dev, "failed to retrieve reset controller: %d\n", ret);
goto err_clk_disable; return PTR_ERR(p2wi->rstc);
} }
ret = reset_control_deassert(p2wi->rstc); ret = reset_control_deassert(p2wi->rstc);
if (ret) { if (ret) {
dev_err(dev, "failed to deassert reset line: %d\n", ret); dev_err(dev, "failed to deassert reset line: %d\n", ret);
goto err_clk_disable; return ret;
} }
init_completion(&p2wi->complete); init_completion(&p2wi->complete);
@ -307,9 +300,6 @@ static int p2wi_probe(struct platform_device *pdev)
err_reset_assert: err_reset_assert:
reset_control_assert(p2wi->rstc); reset_control_assert(p2wi->rstc);
err_clk_disable:
clk_disable_unprepare(p2wi->clk);
return ret; return ret;
} }
@ -318,7 +308,6 @@ static void p2wi_remove(struct platform_device *dev)
struct p2wi *p2wi = platform_get_drvdata(dev); struct p2wi *p2wi = platform_get_drvdata(dev);
reset_control_assert(p2wi->rstc); reset_control_assert(p2wi->rstc);
clk_disable_unprepare(p2wi->clk);
i2c_del_adapter(&p2wi->adapter); i2c_del_adapter(&p2wi->adapter);
} }