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

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

diff --git a/kernel/sound/soc/codecs/max9850.c b/kernel/sound/soc/codecs/max9850.c
index 10f8e47..c14a79d 100644 (file)
--- a/kernel/sound/soc/codecs/max9850.c
+++ b/kernel/sound/soc/codecs/max9850.c
@@ -67,13 +67,12 @@ static const struct regmap_config max9850_regmap = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static const unsigned int max9850_tlv[] = {
-       TLV_DB_RANGE_HEAD(4),
+static const DECLARE_TLV_DB_RANGE(max9850_tlv,
        0x18, 0x1f, TLV_DB_SCALE_ITEM(-7450, 400, 0),
        0x20, 0x33, TLV_DB_SCALE_ITEM(-4150, 200, 0),
        0x34, 0x37, TLV_DB_SCALE_ITEM(-150, 100, 0),
-       0x38, 0x3f, TLV_DB_SCALE_ITEM(250, 50, 0),
-};
+       0x38, 0x3f, TLV_DB_SCALE_ITEM(250, 50, 0)
+);
 
 static const struct snd_kcontrol_new max9850_controls[] = {
 SOC_SINGLE_TLV("Headphone Volume", MAX9850_VOLUME, 0, 0x3f, 1, max9850_tlv),
@@ -252,7 +251,7 @@ static int max9850_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) {
                        ret = regcache_sync(max9850->regmap);
                        if (ret) {
                                dev_err(codec->dev,
@@ -264,7 +263,6 @@ static int max9850_set_bias_level(struct snd_soc_codec *codec,
        case SND_SOC_BIAS_OFF:
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -353,7 +351,6 @@ MODULE_DEVICE_TABLE(i2c, max9850_i2c_id);
 static struct i2c_driver max9850_i2c_driver = {
        .driver = {
                .name = "max9850",
-               .owner = THIS_MODULE,
        },
        .probe = max9850_i2c_probe,
        .remove = max9850_i2c_remove,