diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-04-24 15:15:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-04-24 15:15:31 +0200 |
| commit | baa6584a24494fbbd2862270d39e61b86987cc91 (patch) | |
| tree | 1ad9e7b71703c57fbdfd34bb67f8838b46ac4dc8 /sound/soc/amd/renoir/acp3x-pdm-dma.c | |
| parent | ALSA: emu10k1: use high-level I/O in set_filterQ() (diff) | |
| parent | ASoC: fsl: imx-audmix: remove dummy dai_link->platform (diff) | |
| download | linux-baa6584a24494fbbd2862270d39e61b86987cc91.tar.xz linux-baa6584a24494fbbd2862270d39e61b86987cc91.zip | |
Merge tag 'asoc-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v6.4
The bulk of the commits here are for the conversion of drivers to use
void remove callbacks but there's a reasonable amount of other stuff
going on, the pace of development with the SOF code continues to be high
and there's a bunch of new drivers too:
- More core cleanups from Morimto-san.
- Update drivers to have remove() callbacks returning void, mostly
mechanical with some substantial changes.
- Continued feature and simplification work on SOF, including addition
of a no-DSP mode for bringup, HDA MLink and extensions to the IPC4
protocol.
- Hibernation support for CS35L45.
- More DT binding conversions.
- Support for Cirrus Logic CS35L56, Freescale QMC, Maxim MAX98363,
nVidia systems with MAX9809x and RT5631, Realtek RT712, Renesas R-Car
Gen4, Rockchip RK3588 and TI TAS5733.
Diffstat (limited to 'sound/soc/amd/renoir/acp3x-pdm-dma.c')
| -rw-r--r-- | sound/soc/amd/renoir/acp3x-pdm-dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c index 0d8b693aecc9..4e299f96521f 100644 --- a/sound/soc/amd/renoir/acp3x-pdm-dma.c +++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c @@ -435,10 +435,9 @@ static int acp_pdm_audio_probe(struct platform_device *pdev) return 0; } -static int acp_pdm_audio_remove(struct platform_device *pdev) +static void acp_pdm_audio_remove(struct platform_device *pdev) { pm_runtime_disable(&pdev->dev); - return 0; } static int acp_pdm_resume(struct device *dev) @@ -489,7 +488,7 @@ static const struct dev_pm_ops acp_pdm_pm_ops = { static struct platform_driver acp_pdm_dma_driver = { .probe = acp_pdm_audio_probe, - .remove = acp_pdm_audio_remove, + .remove_new = acp_pdm_audio_remove, .driver = { .name = "acp_rn_pdm_dma", .pm = &acp_pdm_pm_ops, |