diff options
Diffstat (limited to 'sound/soc/codecs/wcd9335.c')
| -rwxr-xr-x | sound/soc/codecs/wcd9335.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 1d14f38d2f86..694b52faa8ea 100755 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -11088,18 +11088,12 @@ int tasha_codec_info_create_codec_entry(struct snd_info_entry *codec_root, } EXPORT_SYMBOL(tasha_codec_info_create_codec_entry); -/* - * tasha_codec_internal_rco_ctrl() - * Make sure that the caller does not acquire - * BG_CLK_LOCK. - */ -static int tasha_codec_internal_rco_ctrl(struct snd_soc_codec *codec, - bool enable) +static int __tasha_codec_internal_rco_ctrl( + struct snd_soc_codec *codec, bool enable) { struct tasha_priv *tasha = snd_soc_codec_get_drvdata(codec); int ret = 0; - WCD9XXX_V2_BG_CLK_LOCK(tasha->resmgr); if (enable) { tasha_cdc_sido_ccl_enable(tasha, true); if (wcd_resmgr_get_clk_type(tasha->resmgr) == @@ -11124,6 +11118,23 @@ static int tasha_codec_internal_rco_ctrl(struct snd_soc_codec *codec, __func__, (enable ? "enabling" : "disabling")); ret = -EINVAL; } + + return ret; +} + +/* + * tasha_codec_internal_rco_ctrl() + * Make sure that the caller does not acquire + * BG_CLK_LOCK. + */ +static int tasha_codec_internal_rco_ctrl(struct snd_soc_codec *codec, + bool enable) +{ + struct tasha_priv *tasha = snd_soc_codec_get_drvdata(codec); + int ret = 0; + + WCD9XXX_V2_BG_CLK_LOCK(tasha->resmgr); + ret = __tasha_codec_internal_rco_ctrl(codec, enable); WCD9XXX_V2_BG_CLK_UNLOCK(tasha->resmgr); return ret; } @@ -12116,7 +12127,7 @@ static int tasha_cpe_initialize(struct snd_soc_codec *codec) } static const struct wcd_resmgr_cb tasha_resmgr_cb = { - .cdc_rco_ctrl = tasha_codec_internal_rco_ctrl, + .cdc_rco_ctrl = __tasha_codec_internal_rco_ctrl, }; static int tasha_device_down(struct wcd9xxx *wcd9xxx) |