diff options
Diffstat (limited to 'sound/soc/codecs/da732x.c')
-rw-r--r-- | sound/soc/codecs/da732x.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 207523686bd5..1d5a89c5164b 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c | |||
@@ -43,7 +43,7 @@ struct da732x_priv { | |||
43 | /* | 43 | /* |
44 | * da732x register cache - default settings | 44 | * da732x register cache - default settings |
45 | */ | 45 | */ |
46 | static struct reg_default da732x_reg_cache[] = { | 46 | static const struct reg_default da732x_reg_cache[] = { |
47 | { DA732X_REG_REF1 , 0x02 }, | 47 | { DA732X_REG_REF1 , 0x02 }, |
48 | { DA732X_REG_BIAS_EN , 0x80 }, | 48 | { DA732X_REG_BIAS_EN , 0x80 }, |
49 | { DA732X_REG_BIAS1 , 0x00 }, | 49 | { DA732X_REG_BIAS1 , 0x00 }, |
@@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, | |||
1196 | #define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ | 1196 | #define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ |
1197 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) | 1197 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) |
1198 | 1198 | ||
1199 | static struct snd_soc_dai_ops da732x_dai1_ops = { | 1199 | static const struct snd_soc_dai_ops da732x_dai_ops = { |
1200 | .hw_params = da732x_hw_params, | ||
1201 | .set_fmt = da732x_set_dai_fmt, | ||
1202 | .set_sysclk = da732x_set_dai_sysclk, | ||
1203 | }; | ||
1204 | |||
1205 | static struct snd_soc_dai_ops da732x_dai2_ops = { | ||
1206 | .hw_params = da732x_hw_params, | 1200 | .hw_params = da732x_hw_params, |
1207 | .set_fmt = da732x_set_dai_fmt, | 1201 | .set_fmt = da732x_set_dai_fmt, |
1208 | .set_sysclk = da732x_set_dai_sysclk, | 1202 | .set_sysclk = da732x_set_dai_sysclk, |
@@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = { | |||
1227 | .rates = DA732X_RATES, | 1221 | .rates = DA732X_RATES, |
1228 | .formats = DA732X_FORMATS, | 1222 | .formats = DA732X_FORMATS, |
1229 | }, | 1223 | }, |
1230 | .ops = &da732x_dai1_ops, | 1224 | .ops = &da732x_dai_ops, |
1231 | }, | 1225 | }, |
1232 | { | 1226 | { |
1233 | .name = "DA732X_AIFB", | 1227 | .name = "DA732X_AIFB", |
@@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = { | |||
1247 | .rates = DA732X_RATES, | 1241 | .rates = DA732X_RATES, |
1248 | .formats = DA732X_FORMATS, | 1242 | .formats = DA732X_FORMATS, |
1249 | }, | 1243 | }, |
1250 | .ops = &da732x_dai2_ops, | 1244 | .ops = &da732x_dai_ops, |
1251 | }, | 1245 | }, |
1252 | }; | 1246 | }; |
1253 | 1247 | ||
@@ -1572,7 +1566,6 @@ MODULE_DEVICE_TABLE(i2c, da732x_i2c_id); | |||
1572 | static struct i2c_driver da732x_i2c_driver = { | 1566 | static struct i2c_driver da732x_i2c_driver = { |
1573 | .driver = { | 1567 | .driver = { |
1574 | .name = "da7320", | 1568 | .name = "da7320", |
1575 | .owner = THIS_MODULE, | ||
1576 | }, | 1569 | }, |
1577 | .probe = da732x_i2c_probe, | 1570 | .probe = da732x_i2c_probe, |
1578 | .remove = da732x_i2c_remove, | 1571 | .remove = da732x_i2c_remove, |