ASoC: dapm: Use devm_clk_get()
PATCH 1/2 ASoC: dapm: Use devm_clk_get()
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -2902,7 +2902,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, }break ;case snd_soc_dapm_clock_supply: - w->clk =clk_get (dapm->dev, w->name); + w->clk =devm_clk_get (dapm->dev, w->name);if (IS_ERR (w->clk)) { ret =PTR_ERR (w->clk); dev_err(dapm->dev, "Failed to request %s: %d\n",
Signature · 1 line
1.7.10
PATCH 2/2 ASoC: dapm: Bodge for lack of a widely available clk API
Reported-by Stephen Rothwell <[email protected]>
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-dapm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-dapm.c +6 -0
@@ -1011,12 +1011,14 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w,if (!w->clk)return -EIO ; +#ifdef CONFIG_HAVE_CLK if (SND_SOC_DAPM_EVENT_ON (event)) {return clk_enable (w->clk); }else {clk_disable (w->clk);return 0 ; } +#endif }EXPORT_SYMBOL_GPL (dapm_clock_event);
@@ -2902,6 +2904,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, }break ;case snd_soc_dapm_clock_supply: +#ifdef CONFIG_HAVE_CLK w->clk =devm_clk_get (dapm->dev, w->name);if (IS_ERR (w->clk)) { ret =PTR_ERR (w->clk);
@@ -2909,6 +2912,9 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, w->name, ret);return NULL ; } +#else + return NULL +#endif break ;default :break ;
Signature · 1 line
1.7.10
Quoted 10 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/soc-dapm.c +0
-0
sound/soc/soc-dapm.c snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, · line 2908
Quoted 8 lines
sound/soc/soc-dapm.c +1
-1@@ -2902,7 +2902,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, }break ;case snd_soc_dapm_clock_supply: - w->clk =clk_get (dapm->dev, w->name); + w->clk =devm_clk_get (dapm->dev, w->name);if (IS_ERR (w->clk)) { ret =PTR_ERR (w->clk); dev_err(dapm->dev, "Failed to request %s: %d\n",
Both
Acked-by Liam Girdwood <[email protected]>