Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42l73', 'asoc...

[karo-tx-linux.git] / sound / soc / codecs / da732x.c

diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 207523686bd55993685693793510ead04460c364..295f0c71f1f52d0c5ed6145b10a16309fb97f830 100644 (file)
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -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,
        },
 };
 
@@ -1572,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,