projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
codecs
/
wm8776.c
diff --git
a/sound/soc/codecs/wm8776.c
b/sound/soc/codecs/wm8776.c
index 0132a27140ae539c85c822b06b984b0733d84e41..8e7953b1b790161a8a394b0b10a7b7d8a160487a 100644
(file)
--- a/
sound/soc/codecs/wm8776.c
+++ b/
sound/soc/codecs/wm8776.c
@@
-25,7
+25,6
@@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
-#include <sound/soc-dapm.h>
#include <sound/initval.h>
#include <sound/tlv.h>
#include <sound/initval.h>
#include <sound/tlv.h>
@@
-306,7
+305,7
@@
static int wm8776_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
case SND_SOC_BIAS_PREPARE:
break;
case SND_SOC_BIAS_STANDBY:
- if (codec->bias_level == SND_SOC_BIAS_OFF) {
+ if (codec->
dapm.
bias_level == SND_SOC_BIAS_OFF) {
/* Disable the global powerdown; DAPM does the rest */
snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0);
}
/* Disable the global powerdown; DAPM does the rest */
snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0);
}
@@
-317,7
+316,7
@@
static int wm8776_set_bias_level(struct snd_soc_codec *codec,
break;
}
break;
}
- codec->bias_level = level;
+ codec->
dapm.
bias_level = level;
return 0;
}
return 0;
}
@@
-404,6
+403,7
@@
static int wm8776_resume(struct snd_soc_codec *codec)
static int wm8776_probe(struct snd_soc_codec *codec)
{
struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
static int wm8776_probe(struct snd_soc_codec *codec)
{
struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
int ret = 0;
ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
int ret = 0;
ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
@@
-427,9
+427,9
@@
static int wm8776_probe(struct snd_soc_codec *codec)
snd_soc_add_controls(codec, wm8776_snd_controls,
ARRAY_SIZE(wm8776_snd_controls));
snd_soc_add_controls(codec, wm8776_snd_controls,
ARRAY_SIZE(wm8776_snd_controls));
- snd_soc_dapm_new_controls(
codec
, wm8776_dapm_widgets,
+ snd_soc_dapm_new_controls(
dapm
, wm8776_dapm_widgets,
ARRAY_SIZE(wm8776_dapm_widgets));
ARRAY_SIZE(wm8776_dapm_widgets));
- snd_soc_dapm_add_routes(
codec
, routes, ARRAY_SIZE(routes));
+ snd_soc_dapm_add_routes(
dapm
, routes, ARRAY_SIZE(routes));
return ret;
}
return ret;
}