tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: codecs/wm*: 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>
Link: https://lore.kernel.org/r/87jzu59m5f.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown 586685f1 4f1ec3da

+18 -10
+6 -6
sound/soc/codecs/wm2200.c
··· 1770 1770 return 0; 1771 1771 } 1772 1772 1773 - static const struct snd_soc_dai_ops wm2200_dai_ops = { 1774 - .set_fmt = wm2200_set_fmt, 1775 - .hw_params = wm2200_hw_params, 1776 - }; 1777 - 1778 1773 static int wm2200_set_sysclk(struct snd_soc_component *component, int clk_id, 1779 1774 int source, unsigned int freq, int dir) 1780 1775 { ··· 2063 2068 return 0; 2064 2069 } 2065 2070 2071 + static const struct snd_soc_dai_ops wm2200_dai_ops = { 2072 + .probe = wm2200_dai_probe, 2073 + .set_fmt = wm2200_set_fmt, 2074 + .hw_params = wm2200_hw_params, 2075 + }; 2076 + 2066 2077 #define WM2200_RATES SNDRV_PCM_RATE_8000_48000 2067 2078 2068 2079 #define WM2200_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ ··· 2076 2075 2077 2076 static struct snd_soc_dai_driver wm2200_dai = { 2078 2077 .name = "wm2200", 2079 - .probe = wm2200_dai_probe, 2080 2078 .playback = { 2081 2079 .stream_name = "Playback", 2082 2080 .channels_min = 2,
+5 -1
sound/soc/codecs/wm5102.c
··· 1773 1773 #define WM5102_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 1774 1774 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) 1775 1775 1776 + static const struct snd_soc_dai_ops wm5102_dai_ops = { 1777 + .compress_new = snd_soc_new_compress, 1778 + }; 1779 + 1776 1780 static struct snd_soc_dai_driver wm5102_dai[] = { 1777 1781 { 1778 1782 .name = "wm5102-aif1", ··· 1910 1906 .rates = WM5102_RATES, 1911 1907 .formats = WM5102_FORMATS, 1912 1908 }, 1913 - .compress_new = snd_soc_new_compress, 1909 + .ops = &wm5102_dai_ops, 1914 1910 }, 1915 1911 { 1916 1912 .name = "wm5102-dsp-trace",
+6 -2
sound/soc/codecs/wm5110.c
··· 2073 2073 #define WM5110_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 2074 2074 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) 2075 2075 2076 + static const struct snd_soc_dai_ops wm5110_dai_ops = { 2077 + .compress_new = snd_soc_new_compress, 2078 + }; 2079 + 2076 2080 static struct snd_soc_dai_driver wm5110_dai[] = { 2077 2081 { 2078 2082 .name = "wm5110-aif1", ··· 2210 2206 .rates = WM5110_RATES, 2211 2207 .formats = WM5110_FORMATS, 2212 2208 }, 2213 - .compress_new = snd_soc_new_compress, 2209 + .ops = &wm5110_dai_ops, 2214 2210 }, 2215 2211 { 2216 2212 .name = "wm5110-dsp-voicectrl", ··· 2231 2227 .rates = WM5110_RATES, 2232 2228 .formats = WM5110_FORMATS, 2233 2229 }, 2234 - .compress_new = snd_soc_new_compress, 2230 + .ops = &wm5110_dai_ops, 2235 2231 }, 2236 2232 { 2237 2233 .name = "wm5110-dsp-trace",
+1 -1
sound/soc/codecs/wm8994.c
··· 3215 3215 }; 3216 3216 3217 3217 static const struct snd_soc_dai_ops wm8994_aif2_dai_ops = { 3218 + .probe = wm8994_aif2_probe, 3218 3219 .set_sysclk = wm8994_set_dai_sysclk, 3219 3220 .set_fmt = wm8994_set_dai_fmt, 3220 3221 .hw_params = wm8994_hw_params, ··· 3270 3269 .formats = WM8994_FORMATS, 3271 3270 .sig_bits = 24, 3272 3271 }, 3273 - .probe = wm8994_aif2_probe, 3274 3272 .ops = &wm8994_aif2_dai_ops, 3275 3273 }, 3276 3274 {