OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: meson: axg-audio: Don't duplicate devm_clk_get_enabled() 

The clk API just got a function with a slightly different name and
the same functionality. Remove the duplication.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220520075737.758761-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Uwe Kleine-König 2022-05-20 09:57:37 +02:00 committed by Stephen Boyd
parent 7ef9651e97
commit 68bde8b2e3
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/clk/meson/axg-audio.c
View File

@ -1657,35 +1657,6 @@ static struct clk_regmap *const sm1_clk_regmaps[] = {
&sm1_sysclk_b_en, &sm1_sysclk_b_en,
}; };
static int devm_clk_get_enable(struct device *dev, char *id)
{
struct clk *clk;
int ret;
clk = devm_clk_get(dev, id);
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
dev_err_probe(dev, ret, "failed to get %s", id);
return ret;
}
ret = clk_prepare_enable(clk);
if (ret) {
dev_err(dev, "failed to enable %s", id);
return ret;
}
ret = devm_add_action_or_reset(dev,
(void(*)(void *))clk_disable_unprepare,
clk);
if (ret) {
dev_err(dev, "failed to add reset action on %s", id);
return ret;
}
return 0;
}
struct axg_audio_reset_data { struct axg_audio_reset_data {
struct reset_controller_dev rstc; struct reset_controller_dev rstc;
struct regmap *map; struct regmap *map;
@ -1787,6 +1758,7 @@ static int axg_audio_clkc_probe(struct platform_device *pdev)
struct regmap *map; struct regmap *map;
void __iomem *regs; void __iomem *regs;
struct clk_hw *hw; struct clk_hw *hw;
struct clk *clk;
int ret, i; int ret, i;
data = of_device_get_match_data(dev); data = of_device_get_match_data(dev);
@ -1804,9 +1776,9 @@ static int axg_audio_clkc_probe(struct platform_device *pdev)
} }
/* Get the mandatory peripheral clock */ /* Get the mandatory peripheral clock */
ret = devm_clk_get_enable(dev, "pclk"); clk = devm_clk_get_enabled(dev, "pclk");
if (ret) if (IS_ERR(clk))
return ret; return PTR_ERR(clk);
ret = device_reset(dev); ret = device_reset(dev);
if (ret) { if (ret) {