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/ti/ams-delta.c | |
parent | 7002cbd625467084f1ef01b6e365e10b51fc4b9f (diff) | |
parent | dc801ea8ae37d54706e6f1cef140731ac5981c9c (diff) | |
download | lwn-baa6584a24494fbbd2862270d39e61b86987cc91.tar.gz lwn-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/ti/ams-delta.c')
-rw-r--r-- | sound/soc/ti/ams-delta.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index 438e2fa843a0..1028b5efcfff 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -578,7 +578,7 @@ static int ams_delta_probe(struct platform_device *pdev) return 0; } -static int ams_delta_remove(struct platform_device *pdev) +static void ams_delta_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -586,7 +586,6 @@ static int ams_delta_remove(struct platform_device *pdev) snd_soc_unregister_card(card); card->dev = NULL; - return 0; } #define DRV_NAME "ams-delta-audio" @@ -596,7 +595,7 @@ static struct platform_driver ams_delta_driver = { .name = DRV_NAME, }, .probe = ams_delta_probe, - .remove = ams_delta_remove, + .remove_new = ams_delta_remove, }; module_platform_driver(ams_delta_driver); |