Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
soc
/
codecs
/
wm8978.c
diff --git
a/kernel/sound/soc/codecs/wm8978.c
b/kernel/sound/soc/codecs/wm8978.c
index
cf70329
..
d36d600
100644
(file)
--- a/
kernel/sound/soc/codecs/wm8978.c
+++ b/
kernel/sound/soc/codecs/wm8978.c
@@
-868,7
+868,7
@@
static int wm8978_set_bias_level(struct snd_soc_codec *codec,
/* bit 3: enable bias, bit 2: enable I/O tie off buffer */
power1 |= 0xc;
/* bit 3: enable bias, bit 2: enable I/O tie off buffer */
power1 |= 0xc;
- if (
codec->dapm.bias_level
== SND_SOC_BIAS_OFF) {
+ if (
snd_soc_codec_get_bias_level(codec)
== SND_SOC_BIAS_OFF) {
/* Initial cap charge at VMID 5k */
snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,
power1 | 0x3);
/* Initial cap charge at VMID 5k */
snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,
power1 | 0x3);
@@
-888,7
+888,6
@@
static int wm8978_set_bias_level(struct snd_soc_codec *codec,
dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1);
dev_dbg(codec->dev, "%s: %d, %x\n", __func__, level, power1);
- codec->dapm.bias_level = level;
return 0;
}
return 0;
}
@@
-928,7
+927,7
@@
static int wm8978_suspend(struct snd_soc_codec *codec)
{
struct wm8978_priv *wm8978 = snd_soc_codec_get_drvdata(codec);
{
struct wm8978_priv *wm8978 = snd_soc_codec_get_drvdata(codec);
-
wm8978_set
_bias_level(codec, SND_SOC_BIAS_OFF);
+
snd_soc_codec_force
_bias_level(codec, SND_SOC_BIAS_OFF);
/* Also switch PLL off */
snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, 0);
/* Also switch PLL off */
snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, 0);
@@
-944,7
+943,7
@@
static int wm8978_resume(struct snd_soc_codec *codec)
/* Sync reg_cache with the hardware */
regcache_sync(wm8978->regmap);
/* Sync reg_cache with the hardware */
regcache_sync(wm8978->regmap);
-
wm8978_set
_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
snd_soc_codec_force
_bias_level(codec, SND_SOC_BIAS_STANDBY);
if (wm8978->f_pllout)
/* Switch PLL on */
if (wm8978->f_pllout)
/* Switch PLL on */
@@
-1073,7
+1072,6
@@
MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
static struct i2c_driver wm8978_i2c_driver = {
.driver = {
.name = "wm8978",
static struct i2c_driver wm8978_i2c_driver = {
.driver = {
.name = "wm8978",
- .owner = THIS_MODULE,
},
.probe = wm8978_i2c_probe,
.remove = wm8978_i2c_remove,
},
.probe = wm8978_i2c_probe,
.remove = wm8978_i2c_remove,