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

ASoC: soc-component: convert not to use asoc_xxx()

ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87edj4p8st.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
c35691ff 28b11fd4

+12 -12
+12 -12
sound/soc/soc-component.c
··· 962 962 963 963 int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream) 964 964 { 965 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 965 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 966 966 struct snd_soc_component *component; 967 967 int i; 968 968 ··· 992 992 snd_pcm_sframes_t *cpu_delay, 993 993 snd_pcm_sframes_t *codec_delay) 994 994 { 995 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 995 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 996 996 struct snd_soc_component *component; 997 997 snd_pcm_sframes_t delay; 998 998 int i; ··· 1019 1019 int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, 1020 1020 unsigned int cmd, void *arg) 1021 1021 { 1022 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1022 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1023 1023 struct snd_soc_component *component; 1024 1024 int i; 1025 1025 ··· 1036 1036 1037 1037 int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream) 1038 1038 { 1039 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1039 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1040 1040 struct snd_soc_component *component; 1041 1041 int i, ret; 1042 1042 ··· 1056 1056 int channel, unsigned long pos, 1057 1057 struct iov_iter *iter, unsigned long bytes) 1058 1058 { 1059 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1059 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1060 1060 struct snd_soc_component *component; 1061 1061 int i; 1062 1062 ··· 1073 1073 struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, 1074 1074 unsigned long offset) 1075 1075 { 1076 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1076 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1077 1077 struct snd_soc_component *component; 1078 1078 struct page *page; 1079 1079 int i; ··· 1094 1094 int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream, 1095 1095 struct vm_area_struct *vma) 1096 1096 { 1097 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1097 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1098 1098 struct snd_soc_component *component; 1099 1099 int i; 1100 1100 ··· 1141 1141 1142 1142 int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream) 1143 1143 { 1144 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1144 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1145 1145 struct snd_soc_component *component; 1146 1146 int i, ret; 1147 1147 ··· 1159 1159 int snd_soc_pcm_component_hw_params(struct snd_pcm_substream *substream, 1160 1160 struct snd_pcm_hw_params *params) 1161 1161 { 1162 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1162 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1163 1163 struct snd_soc_component *component; 1164 1164 int i, ret; 1165 1165 ··· 1180 1180 void snd_soc_pcm_component_hw_free(struct snd_pcm_substream *substream, 1181 1181 int rollback) 1182 1182 { 1183 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1183 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1184 1184 struct snd_soc_component *component; 1185 1185 int i, ret; 1186 1186 ··· 1214 1214 int snd_soc_pcm_component_trigger(struct snd_pcm_substream *substream, 1215 1215 int cmd, int rollback) 1216 1216 { 1217 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1217 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1218 1218 struct snd_soc_component *component; 1219 1219 int i, r, ret = 0; 1220 1220 ··· 1285 1285 1286 1286 int snd_soc_pcm_component_ack(struct snd_pcm_substream *substream) 1287 1287 { 1288 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 1288 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 1289 1289 struct snd_soc_component *component; 1290 1290 int i; 1291 1291