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

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

diff --git a/kernel/sound/soc/codecs/sta350.c b/kernel/sound/soc/codecs/sta350.c
index 669e322..33a4612 100644 (file)
--- a/kernel/sound/soc/codecs/sta350.c
+++ b/kernel/sound/soc/codecs/sta350.c
@@ -853,7 +853,7 @@ static int sta350_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) {
                        ret = regulator_bulk_enable(
                                ARRAY_SIZE(sta350->supplies),
                                sta350->supplies);
@@ -890,7 +890,6 @@ static int sta350_set_bias_level(struct snd_soc_codec *codec,
                                       sta350->supplies);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -1037,7 +1036,7 @@ static int sta350_probe(struct snd_soc_codec *codec)
        sta350->coef_shadow[60] = 0x400000;
        sta350->coef_shadow[61] = 0x400000;
 
-       sta350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+       snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY);
        /* Bias level configuration will have done an extra enable */
        regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);
 
@@ -1218,8 +1217,8 @@ static int sta350_i2c_probe(struct i2c_client *i2c,
        if (IS_ERR(sta350->gpiod_nreset))
                return PTR_ERR(sta350->gpiod_nreset);
 
-       sta350->gpiod_power_down = devm_gpiod_get(dev, "power-down",
-                                                 GPIOD_OUT_LOW);
+       sta350->gpiod_power_down = devm_gpiod_get_optional(dev, "power-down",
+                                                          GPIOD_OUT_LOW);
        if (IS_ERR(sta350->gpiod_power_down))
                return PTR_ERR(sta350->gpiod_power_down);
 
@@ -1265,7 +1264,6 @@ MODULE_DEVICE_TABLE(i2c, sta350_i2c_id);
 static struct i2c_driver sta350_i2c_driver = {
        .driver = {
                .name = "sta350",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(st350_dt_ids),
        },
        .probe =    sta350_i2c_probe,