These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / codecs / wm8711.c

diff --git a/kernel/sound/soc/codecs/wm8711.c b/kernel/sound/soc/codecs/wm8711.c
index 121e46d..c759ec0 100644 (file)
--- a/kernel/sound/soc/codecs/wm8711.c
+++ b/kernel/sound/soc/codecs/wm8711.c
@@ -310,7 +310,7 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_PREPARE:
                break;
        case SND_SOC_BIAS_STANDBY:
-               if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+               if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF)
                        regcache_sync(wm8711->regmap);
 
                snd_soc_write(codec, WM8711_PWR, reg | 0x0040);
@@ -320,7 +320,6 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8711_PWR, 0xffff);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -432,7 +431,6 @@ static int wm8711_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8711_spi_driver = {
        .driver = {
                .name   = "wm8711",
-               .owner  = THIS_MODULE,
                .of_match_table = wm8711_of_match,
        },
        .probe          = wm8711_spi_probe,
@@ -479,7 +477,6 @@ MODULE_DEVICE_TABLE(i2c, wm8711_i2c_id);
 static struct i2c_driver wm8711_i2c_driver = {
        .driver = {
                .name = "wm8711",
-               .owner = THIS_MODULE,
                .of_match_table = wm8711_of_match,
        },
        .probe =    wm8711_i2c_probe,