Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: codecs/cs47lxx: merge DAI call back functions into ops
ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87h6p99m55.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Kuninori Morimoto
and committed by
Mark Brown
e22a907d
80585b0c
+34
-10
+5
-1
sound/soc/codecs/cs47l15.c
+5
-1
sound/soc/codecs/cs47l15.c
···
1143
1143
}
1144
1144
}
1145
1145
1146
+
static const struct snd_soc_dai_ops cs47l15_dai_ops = {
1147
+
.compress_new = snd_soc_new_compress,
1148
+
};
1149
+
1146
1150
static struct snd_soc_dai_driver cs47l15_dai[] = {
1147
1151
{
1148
1152
.name = "cs47l15-aif1",
···
1223
1219
.rates = MADERA_RATES,
1224
1220
.formats = MADERA_FORMATS,
1225
1221
},
1226
-
.compress_new = snd_soc_new_compress,
1222
+
.ops = &cs47l15_dai_ops,
1227
1223
},
1228
1224
{
1229
1225
.name = "cs47l15-dsp-trace",
+6
-2
sound/soc/codecs/cs47l24.c
+6
-2
sound/soc/codecs/cs47l24.c
···
957
957
#define CS47L24_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
958
958
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
959
959
960
+
static const struct snd_soc_dai_ops cs47l24_dai_ops = {
961
+
.compress_new = snd_soc_new_compress,
962
+
};
963
+
960
964
static struct snd_soc_dai_driver cs47l24_dai[] = {
961
965
{
962
966
.name = "cs47l24-aif1",
···
1037
1033
.rates = CS47L24_RATES,
1038
1034
.formats = CS47L24_FORMATS,
1039
1035
},
1040
-
.compress_new = snd_soc_new_compress,
1036
+
.ops = &cs47l24_dai_ops,
1041
1037
},
1042
1038
{
1043
1039
.name = "cs47l24-dsp-voicectrl",
···
1058
1054
.rates = CS47L24_RATES,
1059
1055
.formats = CS47L24_FORMATS,
1060
1056
},
1061
-
.compress_new = snd_soc_new_compress,
1057
+
.ops = &cs47l24_dai_ops,
1062
1058
},
1063
1059
{
1064
1060
.name = "cs47l24-dsp-trace",
+6
-2
sound/soc/codecs/cs47l35.c
+6
-2
sound/soc/codecs/cs47l35.c
···
1348
1348
}
1349
1349
}
1350
1350
1351
+
static const struct snd_soc_dai_ops cs47l35_dai_ops = {
1352
+
.compress_new = snd_soc_new_compress,
1353
+
};
1354
+
1351
1355
static struct snd_soc_dai_driver cs47l35_dai[] = {
1352
1356
{
1353
1357
.name = "cs47l35-aif1",
···
1466
1462
.rates = MADERA_RATES,
1467
1463
.formats = MADERA_FORMATS,
1468
1464
},
1469
-
.compress_new = &snd_soc_new_compress,
1465
+
.ops = &cs47l35_dai_ops,
1470
1466
},
1471
1467
{
1472
1468
.name = "cs47l35-dsp-voicectrl",
···
1487
1483
.rates = MADERA_RATES,
1488
1484
.formats = MADERA_FORMATS,
1489
1485
},
1490
-
.compress_new = &snd_soc_new_compress,
1486
+
.ops = &cs47l35_dai_ops,
1491
1487
},
1492
1488
{
1493
1489
.name = "cs47l35-dsp-trace",
+6
-2
sound/soc/codecs/cs47l85.c
+6
-2
sound/soc/codecs/cs47l85.c
···
2249
2249
}
2250
2250
}
2251
2251
2252
+
static const struct snd_soc_dai_ops cs47l85_dai_ops = {
2253
+
.compress_new = snd_soc_new_compress,
2254
+
};
2255
+
2252
2256
static struct snd_soc_dai_driver cs47l85_dai[] = {
2253
2257
{
2254
2258
.name = "cs47l85-aif1",
···
2408
2404
.rates = MADERA_RATES,
2409
2405
.formats = MADERA_FORMATS,
2410
2406
},
2411
-
.compress_new = &snd_soc_new_compress,
2407
+
.ops = &cs47l85_dai_ops,
2412
2408
},
2413
2409
{
2414
2410
.name = "cs47l85-dsp-voicectrl",
···
2429
2425
.rates = MADERA_RATES,
2430
2426
.formats = MADERA_FORMATS,
2431
2427
},
2432
-
.compress_new = &snd_soc_new_compress,
2428
+
.ops = &cs47l85_dai_ops,
2433
2429
},
2434
2430
{
2435
2431
.name = "cs47l85-dsp-trace",
+6
-2
sound/soc/codecs/cs47l90.c
+6
-2
sound/soc/codecs/cs47l90.c
···
2168
2168
}
2169
2169
}
2170
2170
2171
+
static const struct snd_soc_dai_ops cs47l90_dai_ops = {
2172
+
.compress_new = snd_soc_new_compress,
2173
+
};
2174
+
2171
2175
static struct snd_soc_dai_driver cs47l90_dai[] = {
2172
2176
{
2173
2177
.name = "cs47l90-aif1",
···
2327
2323
.rates = MADERA_RATES,
2328
2324
.formats = MADERA_FORMATS,
2329
2325
},
2330
-
.compress_new = &snd_soc_new_compress,
2326
+
.ops = &cs47l90_dai_ops,
2331
2327
},
2332
2328
{
2333
2329
.name = "cs47l90-dsp-voicectrl",
···
2348
2344
.rates = MADERA_RATES,
2349
2345
.formats = MADERA_FORMATS,
2350
2346
},
2351
-
.compress_new = &snd_soc_new_compress,
2347
+
.ops = &cs47l90_dai_ops,
2352
2348
},
2353
2349
{
2354
2350
.name = "cs47l90-dsp-trace",
+5
-1
sound/soc/codecs/cs47l92.c
+5
-1
sound/soc/codecs/cs47l92.c
···
1690
1690
}
1691
1691
}
1692
1692
1693
+
static const struct snd_soc_dai_ops cs47l92_dai_ops = {
1694
+
.compress_new = snd_soc_new_compress,
1695
+
};
1696
+
1693
1697
static struct snd_soc_dai_driver cs47l92_dai[] = {
1694
1698
{
1695
1699
.name = "cs47l92-aif1",
···
1827
1823
.rates = MADERA_RATES,
1828
1824
.formats = MADERA_FORMATS,
1829
1825
},
1830
-
.compress_new = snd_soc_new_compress,
1826
+
.ops = &cs47l92_dai_ops,
1831
1827
},
1832
1828
{
1833
1829
.name = "cs47l92-dsp-trace",