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

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

diff --git a/kernel/sound/soc/codecs/da9055.c b/kernel/sound/soc/codecs/da9055.c
index ad19cc5..0b2ede8 100644 (file)
--- a/kernel/sound/soc/codecs/da9055.c
+++ b/kernel/sound/soc/codecs/da9055.c
@@ -289,26 +289,23 @@ enum clk_src {
 
 /* Gain and Volume */
 
-static const unsigned int aux_vol_tlv[] = {
-       TLV_DB_RANGE_HEAD(2),
+static const DECLARE_TLV_DB_RANGE(aux_vol_tlv,
        0x0, 0x10, TLV_DB_SCALE_ITEM(-5400, 0, 0),
        /* -54dB to 15dB */
        0x11, 0x3f, TLV_DB_SCALE_ITEM(-5400, 150, 0)
-};
+);
 
-static const unsigned int digital_gain_tlv[] = {
-       TLV_DB_RANGE_HEAD(2),
+static const DECLARE_TLV_DB_RANGE(digital_gain_tlv,
        0x0, 0x07, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),
        /* -78dB to 12dB */
        0x08, 0x7f, TLV_DB_SCALE_ITEM(-7800, 75, 0)
-};
+);
 
-static const unsigned int alc_analog_gain_tlv[] = {
-       TLV_DB_RANGE_HEAD(2),
+static const DECLARE_TLV_DB_RANGE(alc_analog_gain_tlv,
        0x0, 0x0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),
        /* 0dB to 36dB */
        0x01, 0x07, TLV_DB_SCALE_ITEM(0, 600, 0)
-};
+);
 
 static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, -600, 600, 0);
 static const DECLARE_TLV_DB_SCALE(mixin_gain_tlv, -450, 150, 0);
@@ -948,7 +945,7 @@ struct da9055_priv {
        struct da9055_platform_data *pdata;
 };
 
-static struct reg_default da9055_reg_defaults[] = {
+static const struct reg_default da9055_reg_defaults[] = {
        { 0x21, 0x10 },
        { 0x22, 0x0A },
        { 0x23, 0x00 },
@@ -1364,7 +1361,7 @@ static int da9055_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) {
                        /* Enable VMID reference & master bias */
                        snd_soc_update_bits(codec, DA9055_REFERENCES,
                                            DA9055_VMID_EN | DA9055_BIAS_EN,
@@ -1377,7 +1374,6 @@ static int da9055_set_bias_level(struct snd_soc_codec *codec,
                                    DA9055_VMID_EN | DA9055_BIAS_EN, 0);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -1534,12 +1530,12 @@ static const struct of_device_id da9055_of_match[] = {
        { .compatible = "dlg,da9055-codec", },
        { }
 };
+MODULE_DEVICE_TABLE(of, da9055_of_match);
 
 /* I2C codec control layer */
 static struct i2c_driver da9055_i2c_driver = {
        .driver = {
                .name = "da9055-codec",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(da9055_of_match),
        },
        .probe          = da9055_i2c_probe,