diff options
| author | André Draszik <draszik@google.com> | 2023-12-13 11:15:10 +0000 |
|---|---|---|
| committer | André Draszik <draszik@google.com> | 2024-01-17 18:07:57 +0000 |
| commit | 9428809d82f69832a0e28a0c8ff4933a3408ea89 (patch) | |
| tree | 31741bc2491cb652967f7591514740ec9a9376b9 | |
| parent | 4a07cba77783cf755cffc1928655c02bba0c8838 (diff) | |
| download | aoc-android-gs-raviole-mainline.tar.gz | |
treewide: convert asoc_xxx() to snd_soc_xxx() (v6.7 compatibility)android-gs-raviole-mainline
Linux commits [1] and [2] have changed some ASoC APIs which now causes
these OOT Pixel drivers here to fail compilation.
Update accordingly.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1d5a2b5dd0a8
("ASoC: soc.h: convert asoc_xxx() to snd_soc_xxx()")
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad484cc98f2c
("ASoC: remove asoc_xxx() compatible macro")
Bug: 316108031
Test: TH
Change-Id: I107c8c5de718b1b73a3a391b15923403f522dfee
Signed-off-by: André Draszik <draszik@google.com>
(cherry picked from commit 240c35f4a698b68ac66a04aca3c8e85d76766a1c)
| -rw-r--r-- | alsa/aoc_alsa_card.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/alsa/aoc_alsa_card.c b/alsa/aoc_alsa_card.c index a9985fc..b52561c 100644 --- a/alsa/aoc_alsa_card.c +++ b/alsa/aoc_alsa_card.c @@ -349,7 +349,7 @@ static int hw_params_fixup(struct snd_soc_pcm_runtime *rtd, hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct aoc_chip *chip = (struct aoc_chip *)snd_soc_card_get_drvdata(rtd->card); struct snd_card_pdata *pdata = @@ -504,7 +504,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); u32 rate, bclk, channel; int i, bit_width, ret; @@ -553,7 +553,7 @@ static int tdm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *param) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *codec_dai; struct snd_soc_dai_link *dai_link = rtd->dai_link; u32 rate, bclk, channel, tdmslot; @@ -1751,7 +1751,7 @@ static void init_backend_control(struct snd_soc_pcm_runtime *rtd, u32 id) !be_res_map[idx].controls) return; - cpu_dai = asoc_rtd_to_cpu(rtd, 0); + cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); snd_soc_add_dai_controls(cpu_dai, be_res_map[idx].controls, be_res_map[idx].num_controls); } |