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

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

diff --git a/kernel/sound/soc/codecs/sta529.c b/kernel/sound/soc/codecs/sta529.c
index b0f436d..2cdaca9 100644 (file)
--- a/kernel/sound/soc/codecs/sta529.c
+++ b/kernel/sound/soc/codecs/sta529.c
@@ -165,7 +165,7 @@ static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
                                FFX_CLK_ENB);
                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(sta529->regmap);
                snd_soc_update_bits(codec, STA529_FFXCFG0,
                                        POWER_CNTLMSAK, POWER_STDBY);
@@ -179,12 +179,6 @@ static int sta529_set_bias_level(struct snd_soc_codec *codec, enum
                break;
        }
 
-       /*
-        * store the label for powers down audio subsystem for suspend.This is
-        * used by soc core layer
-        */
-       codec->dapm.bias_level = level;
-
        return 0;
 
 }
@@ -345,9 +339,6 @@ static int sta529_i2c_probe(struct i2c_client *i2c,
        struct sta529 *sta529;
        int ret;
 
-       if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               return -EINVAL;
-
        sta529 = devm_kzalloc(&i2c->dev, sizeof(struct sta529), GFP_KERNEL);
        if (!sta529)
                return -ENOMEM;
@@ -385,7 +376,6 @@ MODULE_DEVICE_TABLE(i2c, sta529_i2c_id);
 static struct i2c_driver sta529_i2c_driver = {
        .driver = {
                .name = "sta529",
-               .owner = THIS_MODULE,
        },
        .probe          = sta529_i2c_probe,
        .remove         = sta529_i2c_remove,