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

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

diff --git a/kernel/sound/soc/codecs/da732x.c b/kernel/sound/soc/codecs/da732x.c
index 911c26c..1d5a89c 100644 (file)
--- a/kernel/sound/soc/codecs/da732x.c
+++ b/kernel/sound/soc/codecs/da732x.c
@@ -43,7 +43,7 @@ struct da732x_priv {
 /*
  * da732x register cache - default settings
  */
-static struct reg_default da732x_reg_cache[] = {
+static const struct reg_default da732x_reg_cache[] = {
        { DA732X_REG_REF1               , 0x02 },
        { DA732X_REG_BIAS_EN            , 0x80 },
        { DA732X_REG_BIAS1              , 0x00 },
@@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 #define        DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
-static struct snd_soc_dai_ops da732x_dai1_ops = {
-       .hw_params      = da732x_hw_params,
-       .set_fmt        = da732x_set_dai_fmt,
-       .set_sysclk     = da732x_set_dai_sysclk,
-};
-
-static struct snd_soc_dai_ops da732x_dai2_ops = {
+static const struct snd_soc_dai_ops da732x_dai_ops = {
        .hw_params      = da732x_hw_params,
        .set_fmt        = da732x_set_dai_fmt,
        .set_sysclk     = da732x_set_dai_sysclk,
@@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
                        .rates = DA732X_RATES,
                        .formats = DA732X_FORMATS,
                },
-               .ops = &da732x_dai1_ops,
+               .ops = &da732x_dai_ops,
        },
        {
                .name   = "DA732X_AIFB",
@@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
                        .rates = DA732X_RATES,
                        .formats = DA732X_FORMATS,
                },
-               .ops = &da732x_dai2_ops,
+               .ops = &da732x_dai_ops,
        },
 };
 
@@ -1432,7 +1426,7 @@ static int da732x_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) {
                        /* Init Codec */
                        snd_soc_write(codec, DA732X_REG_REF1,
                                      DA732X_VMID_FASTCHG);
@@ -1502,8 +1496,6 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
-
        return 0;
 }
 
@@ -1574,7 +1566,6 @@ MODULE_DEVICE_TABLE(i2c, da732x_i2c_id);
 static struct i2c_driver da732x_i2c_driver = {
        .driver         = {
                .name   = "da7320",
-               .owner  = THIS_MODULE,
        },
        .probe          = da732x_i2c_probe,
        .remove         = da732x_i2c_remove,