ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: aoa: make remove callback of soundbus driver void returned

Browse Source 
Since commit fc7a6209d5 ("bus: Make remove callback return void")
forces bus_type::remove be void-returned, it doesn't make much sense
for any bus based driver implementing remove callbalk to return
non-void to its caller.

As such, change the remove function for soundbus based drivers to
return void.

Signed-off-by: Dawei Li <set_pte_at@outlook.com>
Link: https://lore.kernel.org/r/TYCP286MB23234FED40A3AE6797DEBAB7CAFB9@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Dawei Li
2023-01-06 23:17:46 +08:00
committed by Takashi Iwai
parent 7351324c6f
commit 47c59e0c21
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/aoa/fabrics/layout.c
View File

@@ -1094,7 +1094,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
return -ENODEV; return -ENODEV;
} }
static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) static void aoa_fabric_layout_remove(struct soundbus_dev *sdev)
{ {
struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);
int i; int i;
@@ -1123,7 +1123,6 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev)
kfree(ldev); kfree(ldev);
sdev->pcmid = -1; sdev->pcmid = -1;
sdev->pcmname = NULL; sdev->pcmname = NULL;
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP

2
sound/aoa/soundbus/soundbus.h
View File

@@ -185,7 +185,7 @@ struct soundbus_driver {
/* we don't implement any matching at all */ /* we don't implement any matching at all */
int (*probe)(struct soundbus_dev* dev); int (*probe)(struct soundbus_dev* dev);
int (*remove)(struct soundbus_dev* dev); void (*remove)(struct soundbus_dev *dev);
int (*shutdown)(struct soundbus_dev* dev); int (*shutdown)(struct soundbus_dev* dev);