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

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

diff --git a/kernel/sound/soc/codecs/wm8988.c b/kernel/sound/soc/codecs/wm8988.c
index 24968aa..895721a 100644 (file)
--- a/kernel/sound/soc/codecs/wm8988.c
+++ b/kernel/sound/soc/codecs/wm8988.c
@@ -738,7 +738,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec,
                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(wm8988->regmap);
 
                        /* VREF, VMID=2x5k */
@@ -756,7 +756,6 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_write(codec, WM8988_PWR1, 0x0000);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -872,7 +871,6 @@ static int wm8988_spi_remove(struct spi_device *spi)
 static struct spi_driver wm8988_spi_driver = {
        .driver = {
                .name   = "wm8988",
-               .owner  = THIS_MODULE,
        },
        .probe          = wm8988_spi_probe,
        .remove         = wm8988_spi_remove,
@@ -920,7 +918,6 @@ MODULE_DEVICE_TABLE(i2c, wm8988_i2c_id);
 static struct i2c_driver wm8988_i2c_driver = {
        .driver = {
                .name = "wm8988",
-               .owner = THIS_MODULE,
        },
        .probe =    wm8988_i2c_probe,
        .remove =   wm8988_i2c_remove,