Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: codecs: tx-macro: move clk provider to managed variants

Browse Source 
[ Upstream commit db8665a3e9 ]

move clk provider registration to managed api variants, this should help
with some code tidyup.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220224111718.6264-4-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: e762143437 ("ASoC: codecs: lpass: fix incorrect mclk rate")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2022-02-24 11:17:05 +00:00 committed by Greg Kroah-Hartman
parent 8ca893710c
commit 05fd63e7f6
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/lpass-tx-macro.c
View File

@ -1745,10 +1745,9 @@ static const struct clk_ops swclk_gate_ops = {
};
static struct clk *tx_macro_register_mclk_output(struct tx_macro *tx)
static int tx_macro_register_mclk_output(struct tx_macro *tx)
{
struct device *dev = tx->dev;
struct device_node *np = dev->of_node;
const char *parent_clk_name = NULL;
const char *clk_name = "lpass-tx-mclk";
struct clk_hw *hw;
@ -1764,13 +1763,11 @@ static struct clk *tx_macro_register_mclk_output(struct tx_macro *tx)
init.num_parents = 1;
tx->hw.init = &init;
hw = &tx->hw;
ret = clk_hw_register(tx->dev, hw);
ret = devm_clk_hw_register(dev, hw);
if (ret)
return ERR_PTR(ret);
return ret;
of_clk_add_provider(np, of_clk_src_simple_get, hw->clk);
return NULL;
return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw);
}
static const struct snd_soc_component_driver tx_macro_component_drv = {
@ -1828,7 +1825,9 @@ static int tx_macro_probe(struct platform_device *pdev)
if (ret)
return ret;
tx_macro_register_mclk_output(tx);
ret = tx_macro_register_mclk_output(tx);
if (ret)
goto err;
ret = devm_snd_soc_register_component(dev, &tx_macro_component_drv,
tx_macro_dai,
@ -1846,8 +1845,6 @@ static int tx_macro_remove(struct platform_device *pdev)
{
struct tx_macro *tx = dev_get_drvdata(&pdev->dev);
of_clk_del_provider(pdev->dev.of_node);
clk_bulk_disable_unprepare(TX_NUM_CLKS_MAX, tx->clks);
return 0;