leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rt5682: Drop usage of __clk_get_name()

Browse Source 
The __clk_get_name() API is deprecated. Use clk_hw_get_name() or
proper registration techniques to avoid it.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Cc: Cheng-Yi Chiang <cychiang@chromium.org>
Cc: Shuming Fan <shumingf@realtek.com>
Link: https://lore.kernel.org/r/20200804000531.920688-3-swboyd@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Stephen Boyd 2020-08-03 17:05:30 -07:00 committed by Mark Brown
parent 0b95aa8e8a
commit edbd24ea1e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/rt5682.c
View File

@ -2548,7 +2548,7 @@ static unsigned long rt5682_wclk_recalc_rate(struct clk_hw *hw,
container_of(hw, struct rt5682_priv, container_of(hw, struct rt5682_priv,
dai_clks_hw[RT5682_DAI_WCLK_IDX]); dai_clks_hw[RT5682_DAI_WCLK_IDX]);
struct snd_soc_component *component = rt5682->component; struct snd_soc_component *component = rt5682->component;
const char * const clk_name = __clk_get_name(hw->clk); const char * const clk_name = clk_hw_get_name(hw);
if (!rt5682_clk_check(rt5682)) if (!rt5682_clk_check(rt5682))
return 0; return 0;
@ -2572,7 +2572,7 @@ static long rt5682_wclk_round_rate(struct clk_hw *hw, unsigned long rate,
container_of(hw, struct rt5682_priv, container_of(hw, struct rt5682_priv,
dai_clks_hw[RT5682_DAI_WCLK_IDX]); dai_clks_hw[RT5682_DAI_WCLK_IDX]);
struct snd_soc_component *component = rt5682->component; struct snd_soc_component *component = rt5682->component;
const char * const clk_name = __clk_get_name(hw->clk); const char * const clk_name = clk_hw_get_name(hw);
if (!rt5682_clk_check(rt5682)) if (!rt5682_clk_check(rt5682))
return -EINVAL; return -EINVAL;
@ -2597,7 +2597,7 @@ static int rt5682_wclk_set_rate(struct clk_hw *hw, unsigned long rate,
dai_clks_hw[RT5682_DAI_WCLK_IDX]); dai_clks_hw[RT5682_DAI_WCLK_IDX]);
struct snd_soc_component *component = rt5682->component; struct snd_soc_component *component = rt5682->component;
struct clk *parent_clk; struct clk *parent_clk;
const char * const clk_name = __clk_get_name(hw->clk); const char * const clk_name = clk_hw_get_name(hw);
int pre_div; int pre_div;
unsigned int clk_pll2_out; unsigned int clk_pll2_out;
@ -2755,33 +2755,31 @@ static int rt5682_register_dai_clks(struct snd_soc_component *component)
struct device *dev = component->dev; struct device *dev = component->dev;
struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
struct rt5682_platform_data *pdata = &rt5682->pdata; struct rt5682_platform_data *pdata = &rt5682->pdata;
struct clk_init_data init;
struct clk *dai_clk; struct clk *dai_clk;
struct clk_lookup *dai_clk_lookup; struct clk_lookup *dai_clk_lookup;
struct clk_hw *dai_clk_hw; struct clk_hw *dai_clk_hw;
const char *parent_name;
int i, ret; int i, ret;
for (i = 0; i < RT5682_DAI_NUM_CLKS; ++i) { for (i = 0; i < RT5682_DAI_NUM_CLKS; ++i) {
struct clk_init_data init = { };
dai_clk_hw = &rt5682->dai_clks_hw[i]; dai_clk_hw = &rt5682->dai_clks_hw[i];
switch (i) { switch (i) {
case RT5682_DAI_WCLK_IDX: case RT5682_DAI_WCLK_IDX:
/* Make MCLK the parent of WCLK */ /* Make MCLK the parent of WCLK */
if (rt5682->mclk) { if (rt5682->mclk) {
parent_name = __clk_get_name(rt5682->mclk); init.parent_data = &(struct clk_parent_data){
init.parent_names = &parent_name; .fw_name = "mclk",
};
init.num_parents = 1; init.num_parents = 1;
} else {
init.parent_names = NULL;
init.num_parents = 0;
} }
break; break;
case RT5682_DAI_BCLK_IDX: case RT5682_DAI_BCLK_IDX:
/* Make WCLK the parent of BCLK */ /* Make WCLK the parent of BCLK */
parent_name = __clk_get_name( init.parent_hws = &(const struct clk_hw *){
rt5682->dai_clks[RT5682_DAI_WCLK_IDX]); &rt5682->dai_clks_hw[RT5682_DAI_WCLK_IDX]
init.parent_names = &parent_name; };
init.num_parents = 1; init.num_parents = 1;
break; break;
default: default: