提交 9887adf1 编写于 作者: L Lars-Peter Clausen 提交者: Mark Brown

ASoC: wm8995: Replace w->codec snd_soc_dapm_to_codec(w->dapm)

The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.
Signed-off-by: NLars-Peter Clausen <lars@metafoo.de>
Acked-by: NCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 12e3080c
...@@ -534,10 +534,11 @@ static void wm8995_update_class_w(struct snd_soc_codec *codec) ...@@ -534,10 +534,11 @@ static void wm8995_update_class_w(struct snd_soc_codec *codec)
static int check_clk_sys(struct snd_soc_dapm_widget *source, static int check_clk_sys(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
unsigned int reg; unsigned int reg;
const char *clk; const char *clk;
reg = snd_soc_read(source->codec, WM8995_CLOCKING_1); reg = snd_soc_read(codec, WM8995_CLOCKING_1);
/* Check what we're currently using for CLK_SYS */ /* Check what we're currently using for CLK_SYS */
if (reg & WM8995_SYSCLK_SRC) if (reg & WM8995_SYSCLK_SRC)
clk = "AIF2CLK"; clk = "AIF2CLK";
...@@ -560,9 +561,7 @@ static int wm8995_put_class_w(struct snd_kcontrol *kcontrol, ...@@ -560,9 +561,7 @@ static int wm8995_put_class_w(struct snd_kcontrol *kcontrol,
static int hp_supply_event(struct snd_soc_dapm_widget *w, static int hp_supply_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec; struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
codec = w->codec;
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
...@@ -611,10 +610,9 @@ static void dc_servo_cmd(struct snd_soc_codec *codec, ...@@ -611,10 +610,9 @@ static void dc_servo_cmd(struct snd_soc_codec *codec,
static int hp_event(struct snd_soc_dapm_widget *w, static int hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec; struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
unsigned int reg; unsigned int reg;
codec = w->codec;
reg = snd_soc_read(codec, WM8995_ANALOGUE_HP_1); reg = snd_soc_read(codec, WM8995_ANALOGUE_HP_1);
switch (event) { switch (event) {
...@@ -761,9 +759,7 @@ static int configure_clock(struct snd_soc_codec *codec) ...@@ -761,9 +759,7 @@ static int configure_clock(struct snd_soc_codec *codec)
static int clk_sys_event(struct snd_soc_dapm_widget *w, static int clk_sys_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec; struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
codec = w->codec;
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册